Change draw order so that the 3D axis spines are not blocked by gridlines

scottshambaugh · scottshambaugh · commit 56f5c0e79090 · 2023-02-20T01:47:22.000-07:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -52,7 +52,7 @@ def allow_rasterization(draw):
     """
 
     @wraps(draw)
-    def draw_wrapper(artist, renderer):
+    def draw_wrapper(artist, renderer, *args, **kwargs):
         try:
             if artist.get_rasterized():
                 if renderer._raster_depth == 0 and not renderer._rasterizing:
@@ -69,7 +69,7 @@ def draw_wrapper(artist, renderer):
             if artist.get_agg_filter() is not None:
                 renderer.start_filter()
 
-            return draw(artist, renderer)
+            return draw(artist, renderer, *args, **kwargs)
         finally:
             if artist.get_agg_filter() is not None:
                 renderer.stop_filter(artist.get_agg_filter())
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -489,9 +489,12 @@ def draw(self, renderer):
             # Draw panes first
             for axis in self._axis_map.values():
                 axis.draw_pane(renderer)
+            # Then gridlines
+            for axis in self._axis_map.values():
+                axis.draw_grid(renderer)
             # Then axes
             for axis in self._axis_map.values():
-                axis.draw(renderer)
+                axis.draw(renderer, grid=False)
 
         # Then rest
         super().draw(renderer)
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -336,7 +336,10 @@ def draw_pane(self, renderer):
         renderer.close_group('pane3d')
 
     @artist.allow_rasterization
-    def draw(self, renderer):
+    def draw(self, renderer, grid=True):
+        if grid and self.axes._draw_grid:
+            self.draw_grid(renderer)
+
         self.label._transform = self.axes.transData
         renderer.open_group("axis3d", gid=self.get_gid())
 
@@ -462,26 +465,6 @@ def draw(self, renderer):
         self.offsetText.set_ha(align)
         self.offsetText.draw(renderer)
 
-        if self.axes._draw_grid and len(ticks):
-            # Grid points where the planes meet
-            xyz0 = np.tile(minmax, (len(ticks), 1))
-            xyz0[:, index] = [tick.get_loc() for tick in ticks]
-
-            # Grid lines go from the end of one plane through the plane
-            # intersection (at xyz0) to the end of the other plane.  The first
-            # point (0) differs along dimension index-2 and the last (2) along
-            # dimension index-1.
-            lines = np.stack([xyz0, xyz0, xyz0], axis=1)
-            lines[:, 0, index - 2] = maxmin[index - 2]
-            lines[:, 2, index - 1] = maxmin[index - 1]
-            self.gridlines.set_segments(lines)
-            gridinfo = info['grid']
-            self.gridlines.set_color(gridinfo['color'])
-            self.gridlines.set_linewidth(gridinfo['linewidth'])
-            self.gridlines.set_linestyle(gridinfo['linestyle'])
-            self.gridlines.do_3d_projection()
-            self.gridlines.draw(renderer)
-
         # Draw ticks:
         tickdir = self._get_tickdir()
         tickdelta = deltas[tickdir] if highs[tickdir] else -deltas[tickdir]
@@ -519,6 +502,45 @@ def draw(self, renderer):
         renderer.close_group('axis3d')
         self.stale = False
 
+    @artist.allow_rasterization
+    def draw_grid(self, renderer):
+        self.label._transform = self.axes.transData
+        renderer.open_group("grid3d", gid=self.get_gid())
+
+        ticks = self._update_ticks()
+
+        # Get general axis information:
+        info = self._axinfo
+        index = info["i"]
+
+        mins, maxs, tc, highs = self._get_coord_info()
+
+        minmax = np.where(highs, maxs, mins)
+        maxmin = np.where(~highs, maxs, mins)
+
+        if self.axes._draw_grid and len(ticks):
+            # Grid points where the planes meet
+            xyz0 = np.tile(minmax, (len(ticks), 1))
+            xyz0[:, index] = [tick.get_loc() for tick in ticks]
+
+            # Grid lines go from the end of one plane through the plane
+            # intersection (at xyz0) to the end of the other plane.  The first
+            # point (0) differs along dimension index-2 and the last (2) along
+            # dimension index-1.
+            lines = np.stack([xyz0, xyz0, xyz0], axis=1)
+            lines[:, 0, index - 2] = maxmin[index - 2]
+            lines[:, 2, index - 1] = maxmin[index - 1]
+            self.gridlines.set_segments(lines)
+            gridinfo = info['grid']
+            self.gridlines.set_color(gridinfo['color'])
+            self.gridlines.set_linewidth(gridinfo['linewidth'])
+            self.gridlines.set_linestyle(gridinfo['linestyle'])
+            self.gridlines.do_3d_projection()
+            self.gridlines.draw(renderer)
+
+        renderer.close_group('grid3d')
+
+
     # TODO: Get this to work (more) properly when mplot3d supports the
     #       transforms framework.
     def get_tightbbox(self, renderer=None, *, for_layout_only=False):
