Split attribute sorting into Path3DCollection.draw.

QuLogic · QuLogic · commit eb2f89252ef4 · 2020-11-11T00:47:37.000-05:00
This moves attribute sorting from `Path3DCollection.do_3d_projection`
into a new `draw` method. Sorted attributes are added only temporarily,
so there is no reason to cache the original values anywhere, and thus
all overridden setters can be dropped.
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -548,10 +548,6 @@ def set_3d_properties(self, zs, zdir):
             xs = []
             ys = []
         self._offsets3d = juggle_axes(xs, ys, np.atleast_1d(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 get_depthshade(self):
@@ -570,38 +566,27 @@ def set_depthshade(self, depthshade):
         self._depthshade = depthshade
         self.stale = True
 
-    def set_facecolor(self, c):
-        # docstring inherited
-        super().set_facecolor(c)
-        self._facecolor3d = self.get_facecolor()
-
-    def set_edgecolor(self, c):
-        # docstring inherited
-        super().set_edgecolor(c)
-        self._edgecolor3d = self.get_edgecolor()
-
-    def set_sizes(self, sizes, dpi=72.0):
-        # docstring inherited
-        super().set_sizes(sizes, dpi=dpi)
-        self._sizes3d = self.get_sizes()
-
-    def set_linewidth(self, lw):
-        # docstring inherited
-        super().set_linewidth(lw)
-        self._linewidth3d = self.get_linewidth()
-
     @cbook._delete_parameter('3.4', 'renderer')
     def do_3d_projection(self, renderer=None):
+        xs, ys, zs = self._offsets3d
+        vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
+                                                        self.axes.M)
+        return np.min(vzs) if vzs.size else np.nan
+
+    @artist.allow_rasterization
+    def draw(self, renderer):
+        self.update_scalarmappable()
+
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
 
-        fcs = (_zalpha(self._facecolor3d, vzs) if self._depthshade else
-               self._facecolor3d)
-        ecs = (_zalpha(self._edgecolor3d, vzs) if self._depthshade else
-               self._edgecolor3d)
-        sizes = self._sizes3d
-        lws = self._linewidth3d
+        fcs = (_zalpha(self.get_facecolor(), vzs) if self._depthshade else
+               self.get_facecolor())
+        ecs = (_zalpha(self.get_edgecolor(), vzs) if self._depthshade else
+               self.get_edgecolor())
+        sizes = self.get_sizes()
+        lws = self.get_linewidth()
 
         # Sort the points based on z coordinates
         # Performance optimization: Create a sorted index array and reorder
@@ -625,14 +610,9 @@ def do_3d_projection(self, renderer=None):
         fcs = mcolors.to_rgba_array(fcs, self._alpha)
         ecs = mcolors.to_rgba_array(ecs, self._alpha)
 
-        super().set_edgecolor(ecs)
-        super().set_facecolor(fcs)
-        super().set_sizes(sizes)
-        super().set_linewidth(lws)
-
-        PathCollection.set_offsets(self, vps)
-
-        return np.min(vzs) if vzs.size else np.nan
+        with cbook._setattr_cm(self, _edgecolors=ecs, _facecolors=fcs,
+                               _linewidths=lws, _offsets=vps, _sizes=sizes):
+            super().draw(renderer)
 
 
 def patch_collection_2d_to_3d(col, zs=0, zdir='z', depthshade=True):
