Merge pull request #14576 from anntzer/3dunits

QuLogic · web-flow · commit 20f08157b55c · 2019-07-18T00:11:58.000-04:00
Let Axes3D share have_units, _on_units_changed with 2d axes.
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -161,11 +161,9 @@ def remove(self):
         # TODO: add legend support
 
     def have_units(self):
-        """Return *True* if units are set on the *x* or *y* axes."""
+        """Return *True* if units are set on any axis."""
         ax = self.axes
-        if ax is None or ax.xaxis is None:
-            return False
-        return ax.xaxis.have_units() or ax.yaxis.have_units()
+        return ax and any(axis.have_units() for axis in ax._get_axis_list())
 
     def convert_xunits(self, x):
         """
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1969,7 +1969,7 @@ def _on_units_changed(self, scalex=False, scaley=False):
         """
         Callback for processing changes to axis units.
 
-        Currently forces updates of data limits and view limits.
+        Currently requests updates of data limits and view limits.
         """
         self.relim()
         self._request_autoscale_view(scalex=scalex, scaley=scaley)
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -9,6 +9,7 @@
 Module containing Axes3D, an object which can plot 3D objects on a
 2D matplotlib figure.
 """
+
 from collections import defaultdict
 from functools import reduce
 import math
@@ -140,14 +141,6 @@ def set_axis_on(self):
         self._axis3don = True
         self.stale = True
 
-    def have_units(self):
-        """
-        Return *True* if units are set on the *x*, *y*, or *z* axes
-
-        """
-        return (self.xaxis.have_units() or self.yaxis.have_units() or
-                self.zaxis.have_units())
-
     def convert_zunits(self, z):
         """
         For artists in an axes, if the zaxis has units support,
@@ -187,11 +180,10 @@ def _process_unit_info(self, xdata=None, ydata=None, zdata=None,
     def set_top_view(self):
         # this happens to be the right view for the viewing coordinates
         # moved up and to the left slightly to fit labels and axes
-        xdwl = (0.95/self.dist)
-        xdw = (0.9/self.dist)
-        ydwl = (0.95/self.dist)
-        ydw = (0.9/self.dist)
-
+        xdwl = 0.95 / self.dist
+        xdw = 0.9 / self.dist
+        ydwl = 0.95 / self.dist
+        ydw = 0.9 / self.dist
         # This is purposely using the 2D Axes's set_xlim and set_ylim,
         # because we are trying to place our viewing pane.
         super().set_xlim(-xdwl, xdw, auto=None)
@@ -1088,12 +1080,8 @@ def can_pan(self):
         return False
 
     def cla(self):
-        """
-        Clear axes
-        """
-        # Disabling mouse interaction might have been needed a long
-        # time ago, but I can't find a reason for it now - BVR (2012-03)
-        #self.disable_mouse_rotation()
+        # docstring inherited.
+
         super().cla()
         self.zaxis.cla()
 
@@ -1116,12 +1104,10 @@ def cla(self):
         self.grid(rcParams['axes3d.grid'])
 
     def disable_mouse_rotation(self):
-        """Disable mouse button callbacks.
-        """
+        """Disable mouse button callbacks."""
         # Disconnect the various events we set.
         for cid in self._cids:
             self.figure.canvas.mpl_disconnect(cid)
-
         self._cids = []
 
     def _button_press(self, event):
