From 53db5943b1f09d69cddf17df478349b5cf9939bc Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 15 Aug 2019 18:35:24 +0300 Subject: [PATCH] Do not allow to clip x marks --- graphs/gui/canvasPanel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/graphs/gui/canvasPanel.py b/graphs/gui/canvasPanel.py index c85640dfe..778a10389 100644 --- a/graphs/gui/canvasPanel.py +++ b/graphs/gui/canvasPanel.py @@ -189,7 +189,7 @@ class GraphCanvasPanel(wx.Panel): if self.graphFrame.ctrlPanel.showY0: allYs.add(0) canvasMinY, canvasMaxY = getLimits(allYs, minExtra=0.05, maxExtra=0.1) - canvasMinX, canvasMaxX = getLimits(allXs, minExtra=0.02, maxExtra=0.09) + canvasMinX, canvasMaxX = getLimits(allXs, minExtra=0.02, maxExtra=0.05) self.subplot.set_ylim(bottom=canvasMinY, top=canvasMaxY) self.subplot.set_xlim(left=canvasMinX, right=canvasMaxX) @@ -208,8 +208,8 @@ class GraphCanvasPanel(wx.Panel): else: xLabel = ' {} {}'.format(roundToPrec(xMark, 4), chosenX.unit) self.subplot.annotate( - xLabel, xy=(xMark, maxY + 0.66 * (canvasMaxY - maxY)), xytext=(-1, -1), - textcoords='offset pixels', ha='left', va='center', fontsize='small') + xLabel, xy=(xMark, canvasMaxY - 10), xytext=(-1, -1), annotation_clip=False, + textcoords='offset pixels', ha='left', va='top', fontsize='small') # Get Y values yMarks = set() @@ -254,7 +254,7 @@ class GraphCanvasPanel(wx.Panel): # Draw Y values for yMark in yMarks: self.subplot.annotate( - ' {}'.format(yMark), xy=(xMark, yMark), xytext=(-1, -1), + ' {}'.format(yMark), xy=(xMark, yMark), xytext=(-1, -1), annotation_clip=False, textcoords='offset pixels', ha='left', va='center', fontsize='small') legendLines = []