Apply un_convert to ginput(), get_xlim(), set_xlim()

dstansby · dstansby · commit 78dda485e727 · 2018-09-25T18:06:19.000+01:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3041,7 +3041,16 @@ def get_xlim(self):
         be greater than the `right` value.
 
         """
-        return tuple(self.viewLim.intervalx)
+        return self._convert_back_lim(self.viewLim.intervalx, self.xaxis)
+
+    def _convert_back_lim(self, lim, axis):
+        """
+        Helper method to convert axis limits back to unitized data.
+        """
+        if axis.converter is not None:
+            lim = [axis.converter.un_convert(l, axis.units, axis) for
+                   l in lim]
+        return tuple(lim)
 
     def _validate_converted_limits(self, limit, convert):
         """
@@ -3393,6 +3402,7 @@ 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)
 
     def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1537,6 +1537,11 @@ def convert_units(self, x):
         ret = self.converter.convert(x, self.units, self)
         return ret
 
+    def unconvert_units(self, x):
+        if self.converter is None:
+            return x
+        return self.converter.un_convert(x, self.units, self)
+
     def set_units(self, u):
         """
         Set the units for axis.
diff --git a/lib/matplotlib/blocking_input.py b/lib/matplotlib/blocking_input.py
@@ -180,12 +180,14 @@ def mouse_event_pop(self, event):
 
     def add_click(self, event):
         """Add the coordinates of an event to the list of clicks."""
-        self.clicks.append((event.xdata, event.ydata))
+        x = event.inaxes.xaxis.unconvert_units(event.xdata)
+        y = event.inaxes.yaxis.unconvert_units(event.ydata)
+        self.clicks.append((x, y))
         _log.info("input %i: %f, %f",
-                  len(self.clicks), event.xdata, event.ydata)
+                  len(self.clicks), x, y)
         # If desired, plot up click.
         if self.show_clicks:
-            line = mlines.Line2D([event.xdata], [event.ydata],
+            line = mlines.Line2D([x], [y],
                                  marker='+', color='r')
             event.inaxes.add_line(line)
             self.marks.append(line)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5815,3 +5815,14 @@ class DummySubplot(matplotlib.axes.SubplotBase, Dummy):
     FactoryDummySubplot = matplotlib.axes.subplot_class_factory(Dummy)
 
     assert DummySubplot is FactoryDummySubplot
+
+
+def test_lim_units():
+    # Check that get_(x,y)lim() returns unitized data
+    fig, ax = plt.subplots()
+    ax.scatter([datetime.datetime(2000, 1, 1)],
+               [datetime.datetime(2000, 1, 1)])
+    xlim = ax.get_xlim()
+    ylim = ax.get_ylim()
+    for l in xlim + ylim:
+        assert type(l) is datetime.datetime
