Do not add padding to 3D axis limits when limits are manually set

scottshambaugh · scottshambaugh · commit 8b5876395b2a · 2023-02-20T01:20:16.000-07:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -841,13 +841,14 @@ def _get_autoscale_on(self):
     def _set_autoscale_on(self, b):
         """
         Set whether this Axis is autoscaled when drawing or by
-        `.Axes.autoscale_view`.
+        `.Axes.autoscale_view`. If b is None, then the value is not changed.
 
         Parameters
         ----------
         b : bool
         """
-        self._autoscale_on = b
+        if b is not None:
+            self._autoscale_on = b
 
     def get_children(self):
         return [self.label, self.offsetText,
@@ -1225,8 +1226,7 @@ def _set_lim(self, v0, v1, *, emit=True, auto):
         # Mark viewlims as no longer stale without triggering an autoscale.
         for ax in self._get_shared_axes():
             ax._stale_viewlims[name] = False
-        if auto is not None:
-            self._set_autoscale_on(bool(auto))
+        self._set_autoscale_on(auto)
 
         if emit:
             self.axes.callbacks.process(f"{name}lim_changed", self.axes)
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -158,6 +158,10 @@ def __init__(
         self.set_axis_on()
         self.M = None
 
+        # Initialize margins, which calls autoscale_view
+        margin = 1/48  # default value
+        self.margins(x=margin, y=margin, z=margin)
+
         # func used to format z -- fall back on major formatters
         self.fmt_zdata = None
 
@@ -581,17 +585,17 @@ def autoscale(self, enable=True, axis='both', tight=None):
             scalez = True
         else:
             if axis in ['x', 'both']:
-                self.set_autoscalex_on(bool(enable))
+                self.set_autoscalex_on(enable)
                 scalex = self.get_autoscalex_on()
             else:
                 scalex = False
             if axis in ['y', 'both']:
-                self.set_autoscaley_on(bool(enable))
+                self.set_autoscaley_on(enable)
                 scaley = self.get_autoscaley_on()
             else:
                 scaley = False
             if axis in ['z', 'both']:
-                self.set_autoscalez_on(bool(enable))
+                self.set_autoscalez_on(enable)
                 scalez = self.get_autoscalez_on()
             else:
                 scalez = False
@@ -616,8 +620,8 @@ def auto_scale_xyz(self, X, Y, Z=None, had_data=None):
         # Let autoscale_view figure out how to use this data.
         self.autoscale_view()
 
-    def autoscale_view(self, tight=None, scalex=True, scaley=True,
-                       scalez=True):
+    def autoscale_view(self, tight=None,
+                       scalex=True, scaley=True, scalez=True):
         """
         Autoscale the view limits using the data limits.
 
@@ -1169,9 +1173,9 @@ def drag_pan(self, button, key, x, y):
         dz = (maxz - minz) * duvw_projected[2]
 
         # Set the new axis limits
-        self.set_xlim3d(minx + dx, maxx + dx)
-        self.set_ylim3d(miny + dy, maxy + dy)
-        self.set_zlim3d(minz + dz, maxz + dz)
+        self.set_xlim3d(minx + dx, maxx + dx, auto=None)
+        self.set_ylim3d(miny + dy, maxy + dy, auto=None)
+        self.set_zlim3d(minz + dz, maxz + dz, auto=None)
 
     def _calc_view_axes(self, eye):
         """
@@ -1308,9 +1312,9 @@ def _scale_axis_limits(self, scale_x, scale_y, scale_z):
         dz = (maxz - minz)*scale_z
 
         # Set the scaled axis limits
-        self.set_xlim3d(cx - dx/2, cx + dx/2)
-        self.set_ylim3d(cy - dy/2, cy + dy/2)
-        self.set_zlim3d(cz - dz/2, cz + dz/2)
+        self.set_xlim3d(cx - dx/2, cx + dx/2, auto=None)
+        self.set_ylim3d(cy - dy/2, cy + dy/2, auto=None)
+        self.set_zlim3d(cz - dz/2, cz + dz/2, auto=None)
 
     def set_zlabel(self, zlabel, fontdict=None, labelpad=None, **kwargs):
         """
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -241,22 +241,12 @@ def get_rotate_label(self, text):
         else:
             return len(text) > 4
 
-    def _get_coord_info(self, renderer):
+    def _get_coord_info(self):
         mins, maxs = np.array([
             self.axes.get_xbound(),
             self.axes.get_ybound(),
             self.axes.get_zbound(),
         ]).T
-
-        # Get the mean value for each bound:
-        centers = 0.5 * (maxs + mins)
-
-        # Add a small offset between min/max point and the edge of the
-        # plot:
-        deltas = (maxs - mins) / 12
-        mins -= 0.25 * deltas
-        maxs += 0.25 * deltas
-
         # Project the bounds along the current position of the cube:
         bounds = mins[0], maxs[0], mins[1], maxs[1], mins[2], maxs[2]
         bounds_proj = self.axes._tunit_cube(bounds, self.axes.M)
@@ -280,7 +270,7 @@ def _get_coord_info(self, renderer):
             elif vertical == 0:  # looking at YZ plane
                 highs = np.array([highs[0], False, False])
 
-        return mins, maxs, centers, deltas, bounds_proj, highs
+        return mins, maxs, bounds_proj, highs
 
     def _get_axis_line_edge_points(self, minmax, maxmin):
         """Get the edge points for the black bolded axis line."""
@@ -331,7 +321,7 @@ def draw_pane(self, renderer):
         """
         renderer.open_group('pane3d', gid=self.get_gid())
 
-        mins, maxs, centers, deltas, tc, highs = self._get_coord_info(renderer)
+        mins, maxs, tc, highs = self._get_coord_info()
 
         info = self._axinfo
         index = info['i']
@@ -357,7 +347,9 @@ def draw(self, renderer):
         index = info["i"]
         juggled = info["juggled"]
 
-        mins, maxs, centers, deltas, tc, highs = self._get_coord_info(renderer)
+        mins, maxs, tc, highs = self._get_coord_info()
+        centers = 0.5 * (maxs + mins)
+        deltas = (maxs - mins) / 12  # label offsets
 
         minmax = np.where(highs, maxs, mins)
         maxmin = np.where(~highs, maxs, mins)
