Unconvert bounds when drawing Line2D

dstansby · dstansby · commit 8b78c9022ce2 · 2018-10-02T10:42:43.000+01:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2996,9 +2996,16 @@ def xaxis_inverted(self):
         left, right = self.get_xlim()
         return right < left
 
-    def get_xbound(self):
-        """Return the lower and upper x-axis bounds, in increasing order."""
-        left, right = self.get_xlim()
+    def get_xbound(self, units=True):
+        """
+        Return the lower and upper x-axis bounds, in increasing order.
+
+        Parameters
+        ----------
+        units : bool, optional
+            If *True*, return bounds with units attached.
+        """
+        left, right = self.get_xlim(units)
         if left < right:
             return left, right
         else:
@@ -3034,10 +3041,15 @@ def set_xbound(self, lower=None, upper=None):
             else:
                 self.set_xlim(upper, lower, auto=None)
 
-    def get_xlim(self):
+    def get_xlim(self, units=True):
         """
         Get the x-axis range
 
+        Parameters
+        ----------
+        units : bool, optional
+            If *True*, return limits with units attached.
+
         Returns
         -------
         xlimits : tuple
@@ -3050,7 +3062,10 @@ def get_xlim(self):
         be greater than the `right` value.
 
         """
-        return self._convert_back_lim(self.viewLim.intervalx, self.xaxis)
+        if units:
+            return self._convert_back_lim(self.viewLim.intervalx, self.xaxis)
+        else:
+            return tuple(self.viewLim.intervalx)
 
     def _convert_back_lim(self, lim, axis):
         """
@@ -3358,9 +3373,16 @@ def yaxis_inverted(self):
         bottom, top = self.get_ylim()
         return top < bottom
 
-    def get_ybound(self):
-        """Return the lower and upper y-axis bounds, in increasing order."""
-        bottom, top = self.get_ylim()
+    def get_ybound(self, units=True):
+        """
+        Return the lower and upper y-axis bounds, in increasing order.
+
+        Parameters
+        ----------
+        units : bool, optional
+            If *True*, return bounds with units attached.
+        """
+        bottom, top = self.get_ylim(units)
         if bottom < top:
             return bottom, top
         else:
@@ -3395,10 +3417,15 @@ def set_ybound(self, lower=None, upper=None):
             else:
                 self.set_ylim(upper, lower, auto=None)
 
-    def get_ylim(self):
+    def get_ylim(self, units=True):
         """
         Get the y-axis range
 
+        Parameters
+        ----------
+        units : bool, optional
+            If *True*, return bounds with units attached.
+
         Returns
         -------
         ylimits : tuple
@@ -3411,8 +3438,10 @@ def get_ylim(self):
         will be greater than the `top` value.
 
         """
-        return self._convert_back_lim(self.viewLim.intervaly, self.yaxis)
-        return tuple(self.viewLim.intervaly)
+        if units:
+            return self._convert_back_lim(self.viewLim.intervaly, self.yaxis)
+        else:
+            return tuple(self.viewLim.intervaly)
 
     def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
                  *, ymin=None, ymax=None):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -760,7 +760,7 @@ def draw(self, renderer):
             self.recache()
         self.ind_offset = 0  # Needed for contains() method.
         if self._subslice and self.axes:
-            x0, x1 = self.axes.get_xbound()
+            x0, x1 = self.axes.get_xbound(units=False)
             i0, = self._x_filled.searchsorted([x0], 'left')
             i1, = self._x_filled.searchsorted([x1], 'right')
             subslice = slice(max(i0 - 1, 0), i1 + 1)
