Code review comments on 3D axlim clipping

scottshambaugh · kyracho · commit 32722d9b6af3 · 2024-10-10T22:00:19.000Z
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -339,7 +339,7 @@ def _prepare_points(self):
             # This might have changed an ndarray into a masked array.
             offset_trf = offset_trf.get_affine()
 
-        if np.ma.isMaskedArray(offsets):
+        if isinstance(offsets, np.ma.MaskedArray):
             offsets = offsets.filled(np.nan)
             # Changing from a masked array to nan-filled ndarray
             # is probably most efficient at this point.
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -452,8 +452,11 @@ def do_3d_projection(self):
         """
         segments = self._segments3d
         if self._axlim_clip:
-            segments = [np.ma.column_stack([*_viewlim_mask(*zip(*points), self.axes)])
-                        for points in segments]
+            all_points = np.ma.vstack(segments)
+            masked_points = np.ma.column_stack([*_viewlim_mask(*all_points.T,
+                                                               self.axes)])
+            segment_lengths = [segment.shape[0] for segment in segments]
+            segments = np.split(masked_points, np.cumsum(segment_lengths[:-1]))
         xyslist = [proj3d._proj_trans_points(points, self.axes.M)
                    for points in segments]
         segments_2d = [np.ma.column_stack([xs, ys]) for xs, ys, zs in xyslist]
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -2594,10 +2594,10 @@ def contour(self, X, Y, Z, *args,
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to *zdir*.
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
         axlim_clip : bool, default: False
             Whether to hide lines with a vertex outside the axes view limits.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
 
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.contour`.
@@ -2641,10 +2641,10 @@ def tricontour(self, *args,
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to *zdir*.
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
         axlim_clip : bool, default: False
             Whether to hide lines with a vertex outside the axes view limits.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.tricontour`.
 
@@ -2698,10 +2698,10 @@ def contourf(self, X, Y, Z, *args,
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to *zdir*.
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
         axlim_clip : bool, default: False
             Whether to hide lines with a vertex outside the axes view limits.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.contourf`.
 
@@ -2738,10 +2738,10 @@ def tricontourf(self, *args, zdir='z', offset=None, axlim_clip=False, **kwargs):
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to zdir.
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
         axlim_clip : bool, default: False
             Whether to hide lines with a vertex outside the axes view limits.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to
             `matplotlib.axes.Axes.tricontourf`.
@@ -2936,10 +2936,10 @@ def bar(self, left, height, zs=0, zdir='z', *args,
             used for all bars.
         zdir : {'x', 'y', 'z'}, default: 'z'
             When plotting 2D data, the direction to use as z ('x', 'y' or 'z').
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
         axlim_clip : bool, default: False
             Whether to hide bars with points outside the axes view limits.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs
             Other keyword arguments are forwarded to
             `matplotlib.axes.Axes.bar`.
@@ -3027,12 +3027,12 @@ def bar3d(self, x, y, z, dx, dy, dz, color=None,
         lightsource : `~matplotlib.colors.LightSource`, optional
             The lightsource to use when *shade* is True.
 
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
-
         axlim_clip : bool, default: False
             Whether to hide the bars with points outside the axes view limits.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Any additional keyword arguments are passed onto
             `~.art3d.Poly3DCollection`.
@@ -3185,12 +3185,12 @@ def quiver(self, X, Y, Z, U, V, W, *,
             Whether all arrows are normalized to have the same length, or keep
             the lengths defined by *u*, *v*, and *w*.
 
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
-
         axlim_clip : bool, default: False
             Whether to hide arrows with points outside the axes view limits.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Any additional keyword arguments are delegated to
             :class:`.Line3DCollection`
@@ -3890,12 +3890,12 @@ def stem(self, x, y, z, *, linefmt='C0-', markerfmt='C0o', basefmt='C3-',
         orientation : {'x', 'y', 'z'}, default: 'z'
             The direction along which stems are drawn.
 
-        data : indexable object, optional
-            DATA_PARAMETER_PLACEHOLDER
-
         axlim_clip : bool, default: False
             Whether to hide stems that are outside the axes limits.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         Returns
         -------
         `.StemContainer`
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -2176,10 +2176,10 @@ def test_computed_zorder():
         ax.add_collection3d(tri)
 
         # plot a vector
-        ax.plot((2, 2), (2, 2), (0, 4), c='red', zorder=2, axlim_clip=False)
+        ax.plot((2, 2), (2, 2), (0, 4), c='red', zorder=2)
 
         # plot some points
-        ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10, axlim_clip=False)
+        ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10)
 
         ax.set_xlim((0, 5.0))
         ax.set_ylim((0, 5.0))
