Merged revisions 8647,8649-8650,8652 via svnmerge from

efiring · efiring · commit c0e4be92d0e2 · 2010-08-21T18:10:24.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8647 | mdboom | 2010-08-18 06:07:37 -1000 (Wed, 18 Aug 2010) | 2 lines Fix bug in regular polygon handling ........ r8649 | mdboom | 2010-08-18 07:00:29 -1000 (Wed, 18 Aug 2010) | 2 lines Fix positions of r axis labels when rmin != 0.0 in polar plots. ........ r8650 | mdboom | 2010-08-18 07:35:26 -1000 (Wed, 18 Aug 2010) | 2 lines Fix unit tests for polar rmin changes in last commit. ........ r8652 | efiring | 2010-08-21 07:49:53 -1000 (Sat, 21 Aug 2010) | 2 lines Axis.set_view_interval: when updating, respect original orientation ........ svn path=/trunk/matplotlib/; revision=8653
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+2010-08-21 Change Axis.set_view_interval() so that when updating an
+           existing interval, it respects the orientation of that
+           interval, and can enlarge but not reduce the interval.
+           This fixes a bug in which Axis.set_ticks would
+           change the view limits of an inverted axis. Whether
+           set_ticks should be affecting the viewLim at all remains
+           an open question. - EF
+
 2010-08-16 Handle NaN's correctly in path analysis routines.  Fixes a
            bug where the best location for a legend was not calculated
            correctly when the line contains NaNs. - MGD
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1696,11 +1696,21 @@ def get_view_interval(self):
         return self.axes.viewLim.intervalx
 
     def set_view_interval(self, vmin, vmax, ignore=False):
+        """
+        If *ignore* is *False*, the order of vmin, vmax
+        does not matter; the original axis orientation will
+        be preserved.
+        """
         if ignore:
             self.axes.viewLim.intervalx = vmin, vmax
         else:
             Vmin, Vmax = self.get_view_interval()
-            self.axes.viewLim.intervalx = min(vmin, Vmin), max(vmax, Vmax)
+            if Vmin < Vmax:
+                self.axes.viewLim.intervalx = (min(vmin, vmax, Vmin),
+                                               max(vmin, vmax, Vmax))
+            else:
+                self.axes.viewLim.intervalx = (max(vmin, vmax, Vmin),
+                                               min(vmin, vmax, Vmax))
 
     def get_minpos(self):
         return self.axes.dataLim.minposx
@@ -1947,11 +1957,21 @@ def get_view_interval(self):
         return self.axes.viewLim.intervaly
 
     def set_view_interval(self, vmin, vmax, ignore=False):
+        """
+        If *ignore* is *False*, the order of vmin, vmax
+        does not matter; the original axis orientation will
+        be preserved.
+        """
         if ignore:
             self.axes.viewLim.intervaly = vmin, vmax
         else:
             Vmin, Vmax = self.get_view_interval()
-            self.axes.viewLim.intervaly = min(vmin, Vmin), max(vmax, Vmax)
+            if Vmin < Vmax:
+                self.axes.viewLim.intervaly = (min(vmin, vmax, Vmin),
+                                               max(vmin, vmax, Vmax))
+            else:
+                self.axes.viewLim.intervaly = (max(vmin, vmax, Vmin),
+                                               min(vmin, vmax, Vmax))
 
     def get_minpos(self):
         return self.axes.dataLim.minposy
