Merge pull request #13364 from anntzer/axis3d-numpy

dstansby · web-flow · commit e6c1ff184e7b · 2019-07-21T17:35:19.000+01:00
Numpyfy tick handling code in Axis3D.
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -240,11 +240,8 @@ def draw(self, renderer):
         self.line.draw(renderer)
 
         # Grid points where the planes meet
-        xyz0 = []
-        for tick in ticks:
-            coord = minmax.copy()
-            coord[index] = tick.get_loc()
-            xyz0.append(coord)
+        xyz0 = np.tile(minmax, (len(ticks), 1))
+        xyz0[:, index] = [tick.get_loc() for tick in ticks]
 
         # Draw labels
         peparray = np.asanyarray(pep)
@@ -350,30 +347,25 @@ def draw(self, renderer):
         self.offsetText.draw(renderer)
 
         # Draw grid lines
-        if len(xyz0) > 0:
+        if self.axes._draw_grid and len(ticks):
             # Grid points at end of one plane
-            xyz1 = copy.deepcopy(xyz0)
+            xyz1 = xyz0.copy()
             newindex = (index + 1) % 3
             newval = get_flip_min_max(xyz1[0], newindex, mins, maxs)
-            for i in range(len(ticks)):
-                xyz1[i][newindex] = newval
+            xyz1[:, newindex] = newval
 
             # Grid points at end of the other plane
-            xyz2 = copy.deepcopy(xyz0)
+            xyz2 = xyz0.copy()
             newindex = (index + 2) % 3
             newval = get_flip_min_max(xyz2[0], newindex, mins, maxs)
-            for i in range(len(ticks)):
-                xyz2[i][newindex] = newval
-
-            lines = list(zip(xyz1, xyz0, xyz2))
-            if self.axes._draw_grid:
-                self.gridlines.set_segments(lines)
-                self.gridlines.set_color([info['grid']['color']] * len(lines))
-                self.gridlines.set_linewidth(
-                    [info['grid']['linewidth']] * len(lines))
-                self.gridlines.set_linestyle(
-                    [info['grid']['linestyle']] * len(lines))
-                self.gridlines.draw(renderer, project=True)
+            xyz2[:, newindex] = newval
+
+            lines = np.stack([xyz1, xyz0, xyz2], axis=1)
+            self.gridlines.set_segments(lines)
+            self.gridlines.set_color(info['grid']['color'])
+            self.gridlines.set_linewidth(info['grid']['linewidth'])
+            self.gridlines.set_linestyle(info['grid']['linestyle'])
+            self.gridlines.draw(renderer, project=True)
 
         # Draw ticks
         tickdir = info['tickdir']
