fix axisartist behavior when axis limit is inverted

leejjoon · leejjoon · commit 0679e935f464 · 2011-08-10T10:14:56.000+09:00
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -767,6 +767,39 @@ def get_tightbbox(self, renderer):
         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/clip_path.py b/lib/mpl_toolkits/axisartist/clip_path.py
@@ -12,13 +12,24 @@ def atan2(dy, dx):
 # FIXME : The current algorithm seems to return incorrect angle when the line
 # ends at the boundary.
 
-def clip(xlines, ylines, x0, clip="right"):
+def clip(xlines, ylines, x0, clip="right", xdir=True, ydir=True):
 
     clipped_xlines = []
     clipped_ylines = []
 
     _pos_angles = []
 
+    if xdir:
+        xsign = 1
+    else:
+        xsign = -1
+
+    if ydir:
+        ysign = 1
+    else:
+        ysign = -1
+        
+
     for x, y in zip(xlines, ylines):
 
         if clip in ["up", "right"]:
@@ -49,7 +60,7 @@ def clip(xlines, ylines, x0, clip="right"):
                     dx = x[i+1] - x[i]
                     dy = y[i+1] - y[i]
 
-                a = degrees(atan2(dy, dx))
+                a = degrees(atan2(ysign*dy, xsign*dx))
                 _pos_angles.append((x0, y0, a))
 
             elif c == 1:
@@ -63,7 +74,7 @@ def clip(xlines, ylines, x0, clip="right"):
                     dx = x[i+1] - x[i]
                     dy = y[i+1] - y[i]
 
-                a = degrees(atan2(dy, dx))
+                a = degrees(atan2(ysign*dy, xsign*dx))
                 _pos_angles.append((x0, y0, a))
 
                 #print x[i], x[i+1]
@@ -82,10 +93,28 @@ def clip_line_to_rect(xline, yline, bbox):
 
     x0, y0, x1, y1 = bbox.extents
 
-    lx1, ly1, c_right_ = clip([xline], [yline], x1, clip="right")
-    lx2, ly2, c_left_ = clip(lx1, ly1, x0, clip="left")
-    ly3, lx3, c_top_ = clip(ly2, lx2, y1, clip="right")
-    ly4, lx4, c_bottom_ = clip(ly3, lx3, y0, clip="left")
+    xdir = x1 > x0
+    ydir = y1 > y0
+    
+    if x1 > x0:
+        lx1, ly1, c_right_ = clip([xline], [yline], x1, clip="right", xdir=xdir, ydir=ydir)
+        lx2, ly2, c_left_ = clip(lx1, ly1, x0, clip="left", xdir=xdir, ydir=ydir)
+    else:
+        lx1, ly1, c_right_ = clip([xline], [yline], x0, clip="right", xdir=xdir, ydir=ydir)
+        lx2, ly2, c_left_ = clip(lx1, ly1, x1, clip="left", xdir=xdir, ydir=ydir)
+
+    if y1 > y0:
+        ly3, lx3, c_top_ = clip(ly2, lx2, y1, clip="right", xdir=ydir, ydir=xdir)
+        ly4, lx4, c_bottom_ = clip(ly3, lx3, y0, clip="left", xdir=ydir, ydir=xdir)
+    else:
+        ly3, lx3, c_top_ = clip(ly2, lx2, y0, clip="right", xdir=ydir, ydir=xdir)
+        ly4, lx4, c_bottom_ = clip(ly3, lx3, y1, clip="left", xdir=ydir, ydir=xdir)
+
+        
+    # lx1, ly1, c_right_ = clip([xline], [yline], x1, clip="right")
+    # lx2, ly2, c_left_ = clip(lx1, ly1, x0, clip="left")
+    # ly3, lx3, c_top_ = clip(ly2, lx2, y1, clip="right")
+    # ly4, lx4, c_bottom_ = clip(ly3, lx3, y0, clip="left")
 
     #c_left = [((x, y), (a+90)%180-180) for (x, y, a) in c_left_ \
     #          if bbox.containsy(y)]
