Also sort line widths for scatter3d.

QuLogic · QuLogic · commit 828c60bfac63 · 2020-08-19T17:55:09.000-04:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -488,6 +488,7 @@ def set_3d_properties(self, zs, zdir):
         self._facecolor3d = self.get_facecolor()
         self._edgecolor3d = self.get_edgecolor()
         self._sizes3d = self.get_sizes()
+        self._linewidth3d = self.get_linewidth()
         self.stale = True
 
     def do_3d_projection(self, renderer):
@@ -499,6 +500,7 @@ def do_3d_projection(self, renderer):
         ecs = (_zalpha(self._edgecolor3d, vzs) if self._depthshade else
                self._edgecolor3d)
         sizes = self._sizes3d
+        lws = self._linewidth3d
 
         # Sort the points based on z coordinates
         # Performance optimization: Create a sorted index array and reorder
@@ -515,6 +517,8 @@ def do_3d_projection(self, renderer):
             ecs = ecs[z_markers_idx]
         if len(sizes) > 1:
             sizes = sizes[z_markers_idx]
+        if len(lws) > 1:
+            lws = lws[z_markers_idx]
         vps = np.column_stack((vxs, vys))
 
         fcs = mcolors.to_rgba_array(fcs, self._alpha)
@@ -523,6 +527,7 @@ def do_3d_projection(self, renderer):
         self.set_edgecolors(ecs)
         self.set_facecolors(fcs)
         self.set_sizes(sizes)
+        self.set_linewidth(lws)
 
         PathCollection.set_offsets(self, vps)
 
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -265,18 +265,23 @@ def test_scatter3d_sorting(fig_ref, fig_test, depthshade):
     edgecolors[5:9, 1:5] = 'C6'
     edgecolors[5:9, 5:9] = 'C7'
 
-    x, y, z, sizes, facecolors, edgecolors = [
+    linewidths = np.full(z.shape, 2)
+    linewidths[0::2, 0::2] = 5
+    linewidths[1::2, 1::2] = 5
+
+    x, y, z, sizes, facecolors, edgecolors, linewidths = [
         a.flatten()
-        for a in [x, y, z, sizes, facecolors, edgecolors]
+        for a in [x, y, z, sizes, facecolors, edgecolors, linewidths]
     ]
 
     ax_ref = fig_ref.gca(projection='3d')
-    sets = (np.unique(a) for a in [sizes, facecolors, edgecolors])
-    for s, fc, ec in itertools.product(*sets):
+    sets = (np.unique(a) for a in [sizes, facecolors, edgecolors, linewidths])
+    for s, fc, ec, lw in itertools.product(*sets):
         subset = (
             (sizes != s) |
             (facecolors != fc) |
-            (edgecolors != ec)
+            (edgecolors != ec) |
+            (linewidths != lw)
         )
         subset = np.ma.masked_array(z, subset, dtype=float)
 
@@ -286,12 +291,12 @@ def test_scatter3d_sorting(fig_ref, fig_test, depthshade):
         # would not occur for the full scatter which has multiple colors.
         fc = np.repeat(fc, sum(~subset.mask))
 
-        ax_ref.scatter(x, y, subset, s=s, fc=fc, ec=ec, alpha=1,
+        ax_ref.scatter(x, y, subset, s=s, fc=fc, ec=ec, lw=lw, alpha=1,
                        depthshade=depthshade)
 
     ax_test = fig_test.gca(projection='3d')
-    ax_test.scatter(x, y, z, s=sizes, fc=facecolors, ec=edgecolors, alpha=1,
-                    depthshade=depthshade)
+    ax_test.scatter(x, y, z, s=sizes, fc=facecolors, ec=edgecolors,
+                    lw=linewidths, alpha=1, depthshade=depthshade)
 
 
 @pytest.mark.parametrize('azim', [-50, 130])  # yellow first, blue first
