Better logic for defaults

jklymak · jklymak · commit c3a131918005 · 2021-05-29T15:51:57.000-07:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2857,8 +2857,8 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
         if self.get_yscale() == 'log':
             y_stickies = y_stickies[y_stickies > 0]
 
-        def handle_single_axis(scale, autoscaleon, shared_axes, interval,
-                               minpos, axis, margin, stickies, set_bound):
+        def handle_single_axis(scale, autoscaleon, shared_axes, name,
+                               axis, margin, stickies, set_bound):
 
             if not (scale and autoscaleon):
                 return  # nothing to do...
@@ -2870,12 +2870,16 @@ def handle_single_axis(scale, autoscaleon, shared_axes, interval,
             x_values = []
             minimum_minpos = np.inf
             for ax in shared:
-                x_values.extend(getattr(ax.dataLim, interval))
+                x_values.extend(getattr(ax.dataLim, f"interval{name}"))
                 minimum_minpos = min(minimum_minpos,
-                                     getattr(ax.dataLim, minpos))
+                                     getattr(ax.dataLim, f"minpos{name}"))
             x_values = np.extract(np.isfinite(x_values), x_values)
             if x_values.size >= 1:
                 x0, x1 = (x_values.min(), x_values.max())
+            elif getattr(self._viewLim, f"mutated{name}")():
+                # No data, but explicit viewLims already set:
+                # in mutatedx or mutatedy.
+                return
             else:
                 x0, x1 = (-np.inf, np.inf)
             # If x0 and x1 are non finite, use the locator to figure out
@@ -2919,11 +2923,11 @@ def handle_single_axis(scale, autoscaleon, shared_axes, interval,
             # End of definition of internal function 'handle_single_axis'.
 
         handle_single_axis(
-            scalex, self._autoscaleXon, self._shared_x_axes, 'intervalx',
-            'minposx', self.xaxis, self._xmargin, x_stickies, self.set_xbound)
+            scalex, self._autoscaleXon, self._shared_x_axes, 'x',
+            self.xaxis, self._xmargin, x_stickies, self.set_xbound)
         handle_single_axis(
-            scaley, self._autoscaleYon, self._shared_y_axes, 'intervaly',
-            'minposy', self.yaxis, self._ymargin, y_stickies, self.set_ybound)
+            scaley, self._autoscaleYon, self._shared_y_axes, 'y',
+            self.yaxis, self._ymargin, y_stickies, self.set_ybound)
 
     def _get_axis_list(self):
         return self.xaxis, self.yaxis
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1457,7 +1457,7 @@ def update_units(self, data):
         if default is not None and self.units is None:
             self.set_units(default)
 
-        if neednew:
+        elif neednew:
             self._update_axisinfo()
         self.stale = True
         return True
@@ -2268,7 +2268,8 @@ def set_default_intervals(self):
         # docstring inherited
         xmin, xmax = 0., 1.
         # only change view if dataLim has not changed:
-        if not self.axes.dataLim.mutatedx():
+        if (not self.axes.dataLim.mutatedx() and
+                not self.axes.viewLim.mutatedx()):
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
@@ -2527,9 +2528,9 @@ def set_inverted(self, inverted):
 
     def set_default_intervals(self):
         # docstring inherited
-        print('Settimg y default ')
         ymin, ymax = 0., 1.
-        if not self.axes.dataLim.mutatedy():
+        if (not self.axes.dataLim.mutatedy() and
+                not self.axes.viewLim.mutatedy()):
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
