diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py index 77ac83f824bd..45d38a346a69 100644 --- a/lib/mpl_toolkits/mplot3d/axes3d.py +++ b/lib/mpl_toolkits/mplot3d/axes3d.py @@ -2445,11 +2445,20 @@ def plot_wireframe(self, X, Y, Z, *, axlim_clip=False, **kwargs): row_lines = np.stack([X[rii], Y[rii], Z[rii]], axis=-1) col_lines = np.stack([tX[cii], tY[cii], tZ[cii]], axis=-1) - lines = np.concatenate([row_lines, col_lines]) + # We autoscale twice because autoscaling is much faster with vectorized numpy + # arrays, but row_lines and col_lines might not be the same shape, so we can't + # stack them to check them in a single pass. + # Note that while the column and row grid points are the same, the lines + # between them may expand the view limits, so we have to check both. + self.auto_scale_xyz(row_lines[..., 0], row_lines[..., 1], row_lines[..., 2], + had_data) + self.auto_scale_xyz(col_lines[..., 0], col_lines[..., 1], col_lines[..., 2], + had_data=True) + + lines = list(row_lines) + list(col_lines) linec = art3d.Line3DCollection(lines, axlim_clip=axlim_clip, **kwargs) self.add_collection(linec) - self.auto_scale_xyz(X, Y, Z, had_data) return linec diff --git a/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dasymmetric.png b/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dasymmetric.png new file mode 100644 index 000000000000..73507bf2f6c1 Binary files /dev/null and b/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dasymmetric.png differ diff --git a/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerocstride.png b/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerocstride.png index 0623cad002e8..7e4cf6a0c014 100644 Binary files a/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerocstride.png and b/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerocstride.png differ diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py index b59798e85c52..189bede2bd2a 100644 --- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py +++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py @@ -845,6 +845,14 @@ def test_wireframe3d(): ax.plot_wireframe(X, Y, Z, rcount=13, ccount=13) +@mpl3d_image_comparison(['wireframe3dasymmetric.png'], style='mpl20') +def test_wireframe3dasymmetric(): + fig = plt.figure() + ax = fig.add_subplot(projection='3d') + X, Y, Z = axes3d.get_test_data(0.05) + ax.plot_wireframe(X, Y, Z, rcount=3, ccount=13) + + @mpl3d_image_comparison(['wireframe3dzerocstride.png'], style='mpl20') def test_wireframe3dzerocstride(): fig = plt.figure()