FIX and TST

jklymak · jklymak · commit 6f3bae31a5af · 2021-05-29T13:08:52.000-07:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -2267,17 +2267,15 @@ def set_inverted(self, inverted):
     def set_default_intervals(self):
         # docstring inherited
         xmin, xmax = 0., 1.
-        dataMutated = self.axes.dataLim.mutatedx()
-        viewMutated = self.axes.viewLim.mutatedx()
-        if not dataMutated or not viewMutated:
+        # only change view if dataLim has not changed:
+        if not self.axes.dataLim.mutatedx():
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
                     valmin, valmax = info.default_limits
                     xmin = self.converter.convert(valmin, self.units, self)
                     xmax = self.converter.convert(valmax, self.units, self)
-            if not viewMutated:
-                self.axes.viewLim.intervalx = xmin, xmax
+                    self.axes.viewLim.intervalx = xmin, xmax
         self.stale = True
 
     def get_tick_space(self):
@@ -2529,18 +2527,16 @@ def set_inverted(self, inverted):
 
     def set_default_intervals(self):
         # docstring inherited
+        print('Settimg y default ')
         ymin, ymax = 0., 1.
-        dataMutated = self.axes.dataLim.mutatedy()
-        viewMutated = self.axes.viewLim.mutatedy()
-        if not dataMutated or not viewMutated:
+        if not self.axes.dataLim.mutatedy():
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
                     valmin, valmax = info.default_limits
                     ymin = self.converter.convert(valmin, self.units, self)
                     ymax = self.converter.convert(valmax, self.units, self)
-            if not viewMutated:
-                self.axes.viewLim.intervaly = ymin, ymax
+                    self.axes.viewLim.intervaly = ymin, ymax
         self.stale = True
 
     def get_tick_space(self):
diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
@@ -67,7 +67,8 @@ def default_units(value, axis):
             return None
 
     qc.convert = MagicMock(side_effect=convert)
-    qc.axisinfo = MagicMock(side_effect=lambda u, a: munits.AxisInfo(label=u))
+    qc.axisinfo = MagicMock(side_effect=lambda u, a:
+                            munits.AxisInfo(label=u, default_limits=(0, 100)))
     qc.default_units = MagicMock(side_effect=default_units)
     return qc
 
@@ -219,3 +220,47 @@ def test_shared_axis_categorical():
     ax2.plot(d2.keys(), d2.values())
     ax1.xaxis.set_units(UnitData(["c", "d"]))
     assert "c" in ax2.xaxis.get_units()._mapping.keys()
+
+
+def test_empty_default_limits(quantity_converter):
+    munits.registry[Quantity] = quantity_converter
+    fig, ax1 = plt.subplots()
+    ax1.xaxis.update_units(Quantity([10], "miles"))
+    fig.draw_no_output()
+    assert ax1.get_xlim() == (0, 100)
+    ax1.yaxis.update_units(Quantity([10], "miles"))
+    fig.draw_no_output()
+    assert ax1.get_ylim() == (0, 100)
+
+    fig, ax = plt.subplots()
+    ax.axhline(30)
+    ax.plot(Quantity(np.arange(0, 3), "miles"), 
+            Quantity(np.arange(0, 6, 2), "feet"))
+    fig.draw_no_output()
+    assert ax.get_xlim() == (0, 2)
+    assert ax.get_ylim() == (0, 30)
+
+    fig, ax = plt.subplots()
+    ax.axvline(30)
+    ax.plot(Quantity(np.arange(0, 3), "miles"), 
+            Quantity(np.arange(0, 6, 2), "feet"))
+    fig.draw_no_output()
+    assert ax.get_xlim() == (0, 30)
+    assert ax.get_ylim() == (0, 4)
+
+    fig, ax = plt.subplots()
+    ax.xaxis.update_units(Quantity([10], "miles"))
+    ax.axhline(30)
+    fig.draw_no_output()
+    assert ax.get_xlim() == (0, 100)
+    assert ax.get_ylim() == (28.5, 31.5)
+    
+    fig, ax = plt.subplots()
+    ax.yaxis.update_units(Quantity([10], "miles"))
+    ax.axvline(30)
+    fig.draw_no_output()
+    assert ax.get_ylim() == (0, 100)
+    assert ax.get_xlim() == (28.5, 31.5)
+    
+
+    
