Use all available plot space

scottshambaugh · scottshambaugh · commit da0e6070bba6 · 2022-07-21T19:07:33.000-06:00
diff --git a/doc/users/next_whats_new/3d_plot_aspects.rst b/doc/users/next_whats_new/3d_plot_aspects.rst
@@ -14,9 +14,9 @@ Users can set the aspect ratio for the X, Y, Z axes of a 3D plot to be 'equal',
     aspects = ('auto', 'equal', 'equalxy', 'equalyz', 'equalxz')
     fig, axs = plt.subplots(1, len(aspects), subplot_kw={'projection': '3d'})
 
-    # Draw rectangular cuboid with side lengths [1, 1, 2]
+    # Draw rectangular cuboid with side lengths [1, 1, 5]
     r = [0, 1]
-    scale = np.array([1, 1, 2])
+    scale = np.array([1, 1, 5])
     pts = combinations(np.array(list(product(r, r, r))), 2)
     for start, end in pts:
         if np.sum(np.abs(start - end)) == r[1] - r[0]:
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -325,25 +325,27 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
 
         if aspect in ('equal', 'equalxy', 'equalxz', 'equalyz'):
             if aspect == 'equal':
-                axis_indices = [0, 1, 2]
+                ax_indices = [0, 1, 2]
             elif aspect == 'equalxy':
-                axis_indices = [0, 1]
+                ax_indices = [0, 1]
             elif aspect == 'equalxz':
-                axis_indices = [0, 2]
+                ax_indices = [0, 2]
             elif aspect == 'equalyz':
-                axis_indices = [1, 2]
+                ax_indices = [1, 2]
 
             view_intervals = np.array([self.xaxis.get_view_interval(),
                                        self.yaxis.get_view_interval(),
                                        self.zaxis.get_view_interval()])
             mean = np.mean(view_intervals, axis=1)
-            delta = np.max(np.ptp(view_intervals, axis=1))
-            deltas = delta * self._box_aspect / min(self._box_aspect)
+            ptp = np.ptp(view_intervals, axis=1)
+            delta = max(ptp[ax_indices])
+            scale = self._box_aspect[ptp == delta][0]
+            deltas = delta * self._box_aspect / scale
 
             for i, set_lim in enumerate((self.set_xlim3d,
                                          self.set_ylim3d,
                                          self.set_zlim3d)):
-                if i in axis_indices:
+                if i in ax_indices:
                     set_lim(mean[i] - deltas[i]/2., mean[i] + deltas[i]/2.)
 
     def set_box_aspect(self, aspect, *, zoom=1):
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -32,9 +32,9 @@ def test_aspects():
     aspects = ('auto', 'equal', 'equalxy', 'equalyz', 'equalxz')
     fig, axs = plt.subplots(1, len(aspects), subplot_kw={'projection': '3d'})
 
-    # Draw rectangular cuboid with side lengths [1, 1, 2]
+    # Draw rectangular cuboid with side lengths [1, 1, 5]
     r = [0, 1]
-    scale = np.array([1, 1, 2])
+    scale = np.array([1, 1, 5])
     pts = itertools.combinations(np.array(list(itertools.product(r, r, r))), 2)
     for start, end in pts:
         if np.sum(np.abs(start - end)) == r[1] - r[0]:
