Merge pull request #9363 from anntzer/ignore-invalid-limits-in-pan

dstansby · web-flow · commit efbaded213fb · 2017-10-23T10:11:04.000+01:00
Allow invalid limits when panning
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3805,7 +3805,7 @@ def format_deltas(key, dx, dy):
                     dy = dy / abs(dy) * abs(dx)
                 else:
                     dx = dx / abs(dx) * abs(dy)
-            return (dx, dy)
+            return dx, dy
 
         p = self._pan_start
         dx = x - p.x
@@ -3814,29 +3814,30 @@ def format_deltas(key, dx, dy):
             return
         if button == 1:
             dx, dy = format_deltas(key, dx, dy)
-            result = p.bbox.translated(-dx, -dy) \
-                .transformed(p.trans_inverse)
+            result = p.bbox.translated(-dx, -dy).transformed(p.trans_inverse)
         elif button == 3:
             try:
-                dx = -dx / float(self.bbox.width)
-                dy = -dy / float(self.bbox.height)
+                dx = -dx / self.bbox.width
+                dy = -dy / self.bbox.height
                 dx, dy = format_deltas(key, dx, dy)
                 if self.get_aspect() != 'auto':
-                    dx = 0.5 * (dx + dy)
-                    dy = dx
-
+                    dx = dy = 0.5 * (dx + dy)
                 alpha = np.power(10.0, (dx, dy))
                 start = np.array([p.x, p.y])
                 oldpoints = p.lim.transformed(p.trans)
                 newpoints = start + alpha * (oldpoints - start)
-                result = mtransforms.Bbox(newpoints) \
-                    .transformed(p.trans_inverse)
+                result = (mtransforms.Bbox(newpoints)
+                          .transformed(p.trans_inverse))
             except OverflowError:
                 warnings.warn('Overflow while panning')
                 return
 
-        self.set_xlim(*result.intervalx)
-        self.set_ylim(*result.intervaly)
+        valid = np.isfinite(result.transformed(p.trans))
+        points = result.get_points().astype(object)
+        # Just ignore invalid limits (typically, underflow in log-scale).
+        points[~valid] = None
+        self.set_xlim(points[:, 0])
+        self.set_ylim(points[:, 1])
 
     @cbook.deprecated("2.1")
     def get_cursor_props(self):
