use set_ybound

Author: t20100

src/silx/gui/plot/backends/BackendMatplotlib.py

@@ -552,6 +552,7 @@ def __init__(self, plot, parent=None):
         for axis in (self.ax.yaxis, self.ax.xaxis, self.ax2.yaxis, self.ax2.xaxis):
             axis.set_major_formatter(DefaultTickFormatter())
 
+        self.ax.set_autoscaley_on(True)
         self.ax2.set_autoscaley_on(True)
 
         # this works but the figure color is left
@@ -1193,19 +1194,9 @@ def setLimits(self, xmin, xmax, ymin, ymax, y2min=None, y2max=None):
         self.ax.set_xlim(min(xmin, xmax), max(xmin, xmax))
 
         if y2min is not None and y2max is not None:
-            if self.ax2.get_autoscaley_on():
-                pass
-            elif not self.isYAxisInverted():
-                self.ax2.set_ylim(min(y2min, y2max), max(y2min, y2max))
-            else:
-                self.ax2.set_ylim(max(y2min, y2max), min(y2min, y2max))
+            self.ax2.set_ybound(y2min, y2max)
 
-        if self.ax.get_autoscaley_on():
-            pass
-        elif not self.isYAxisInverted():
-            self.ax.set_ylim(min(ymin, ymax), max(ymin, ymax))
-        else:
-            self.ax.set_ylim(max(ymin, ymax), min(ymin, ymax))
+        self.ax.set_ybound(ymin, ymax)
 
         self._updateMarkers()
 
@@ -1237,8 +1228,6 @@ def getGraphYLimits(self, axis):
 
     def setGraphYLimits(self, ymin, ymax, axis):
         ax = self.ax2 if axis == "right" else self.ax
-        if ymax < ymin:
-            ymin, ymax = ymax, ymin
         self._dirtyLimits = True
 
         if self.isKeepDataAspectRatio():
@@ -1250,14 +1239,11 @@ def setGraphYLimits(self, ymin, ymax, axis):
             xmin, xmax = ax.get_xbound()
             curYMin, curYMax = ax.get_ybound()
 
-            newXRange = (xmax - xmin) * (ymax - ymin) / (curYMax - curYMin)
+            newXRange = (xmax - xmin) * abs(ymax - ymin) / (curYMax - curYMin)
             xcenter = 0.5 * (xmin + xmax)
             ax.set_xlim(xcenter - 0.5 * newXRange, xcenter + 0.5 * newXRange)
 
-        if not self.isYAxisInverted():
-            ax.set_ylim(ymin, ymax)
-        else:
-            ax.set_ylim(ymax, ymin)
+        ax.set_ybound(ymin, ymax)
 
         self._updateMarkers()
 
@@ -1319,7 +1305,7 @@ def setYAxisLogarithmic(self, flag):
                     dataRange = self._plot.getDataRange()[dataRangeIndex]
                     if dataRange is None:
                         dataRange = 1, 100  # Fallback
-                    axis.set_ylim(*dataRange)
+                    axis.set_ybound(*dataRange)
                     redraw = True
             if redraw:
                 self.draw()
@@ -1351,8 +1337,6 @@ def isKeepDataAspectRatio(self):
     def setKeepDataAspectRatio(self, flag):
         self.ax.set_aspect(1.0 if flag else "auto")
         self.ax2.set_aspect(1.0 if flag else "auto")
-        self.ax.set_autoscaley_on(flag)
-        self.ax2.set_autoscaley_on(flag)
 
     def setGraphGrid(self, which):
         self.ax.grid(False, which="both")  # Disable all grid first