axisartist: fix set_xlim & set_ylim behavior

leejjoon · leejjoon · commit 6a250a962976 · 2012-07-16T23:05:35.000+09:00
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -217,7 +217,6 @@ def get_tick_transform(self, axes):
             return trans_tick
 
 
-
     class Floating(_Base):
         def __init__(self, nth_coord,
                      value):
@@ -811,38 +810,6 @@ def get_tightbbox(self, renderer, call_axes_locator=True):
         return _bbox
 
 
-    def set_xlim(self, left=None, right=None, emit=True, auto=False,
-                 swap_axis=True, **kw):
-
-        x1o, x2o = self.get_xlim()
-
-        maxes.Axes.set_xlim(self, left, right, emit, auto, **kw)
-        x1, x2 = self.get_xlim()
-
-        if not swap_axis:
-            return
-
-        if (x1o > x2o and x1 < x2) or (x1o < x2o and x1 > x2):
-            self.axis["right"], self.axis["left"] = self.axis["left"], self.axis["right"]
-
-            self.axis["left"].set_axis_direction("left")
-            self.axis["right"].set_axis_direction("right")
-
-
-    def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
-                 swap_axis=True, **kw):
-
-        y1o, y2o = self.get_ylim()
-
-        maxes.Axes.set_ylim(self, bottom, top, emit, auto, **kw)
-        y1, y2 = self.get_ylim()
-
-        if y1o > y2o and y1 < y2 or (y1o < y2o and y1 > y2):
-            self.axis["top"], self.axis["bottom"] = self.axis["bottom"], self.axis["top"]
-
-            self.axis["top"].set_axis_direction("top")
-            self.axis["bottom"].set_axis_direction("bottom")
-
 
 
 Subplot = maxes.subplot_class_factory(Axes)
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -34,10 +34,22 @@ def __init__(self, grid_helper, side, nth_coord_ticks=None):
         self.nth_coord_ticks = nth_coord_ticks
 
         self.side = side
+        self._limits_inverted = False
 
     def update_lim(self, axes):
         self.grid_helper.update_lim(axes)
 
+        if self.nth_coord == 0:
+            xy1, xy2 = axes.get_ylim()
+        else:
+            xy1, xy2 = axes.get_xlim()
+
+        if xy1 > xy2:
+            self._limits_inverted = True
+        else:
+            self._limits_inverted = False
+
+
     def change_tick_coord(self, coord_number=None):
         if coord_number is None:
             self.nth_coord_ticks = 1 - self.nth_coord_ticks
@@ -55,14 +67,21 @@ def get_tick_iterators(self, axes):
 
         g = self.grid_helper
 
-        ti1 = g.get_tick_iterator(self.nth_coord_ticks, self.side)
-        ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, self.side, minor=True)
+        if self._limits_inverted:
+            side = {"left":"right","right":"left",
+                    "top":"bottom", "bottom":"top"}[self.side]
+        else:
+            side = self.side
+
+        ti1 = g.get_tick_iterator(self.nth_coord_ticks, side)
+        ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, side, minor=True)
 
         #ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, self.side, minor=True)
 
         return chain(ti1, ti2), iter([])
 
 
+
 class FloatingAxisArtistHelper(AxisArtistHelper.Floating):
 
     def __init__(self, grid_helper, nth_coord, value, axis_direction=None):
