Named kwargs for axes3d.plot_surface

Zac-HD · Zac-HD · commit ca5b925ca52e · 2018-05-19T00:13:28.000+10:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1573,8 +1573,9 @@ def plot(self, xs, ys, *args, zdir='z', **kwargs):
 
     plot3D = plot
 
-    def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
-                     vmax=None, lightsource=None, **kwargs):
+    def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None, vmax=None,
+                     lightsource=None, facecolors=None, color=None, cmap=None,
+                     shade=None, **kwargs):
         """
         Create a surface plot.
 
@@ -1663,25 +1664,20 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
                 rstride = int(max(np.ceil(rows / rcount), 1))
                 cstride = int(max(np.ceil(cols / ccount), 1))
 
-        if 'facecolors' in kwargs:
-            fcolors = kwargs.pop('facecolors')
-        else:
-            color = kwargs.pop('color', None)
+        if facecolors is None:
             if color is None:
                 color = self._get_lines.get_next_color()
             color = np.array(mcolors.to_rgba(color))
-            fcolors = None
-
-        cmap = kwargs.get('cmap', None)
-        shade = kwargs.pop('shade', cmap is None)
+        if shade is None:
+            shade = cmap is None
 
         # Shade the data
-        if shade and cmap is not None and fcolors is not None:
-            fcolors = self._shade_colors_lightsource(Z, cmap, lightsource)
+        if shade and cmap is not None and facecolors is not None:
+            facecolors = self._shade_colors_lightsource(Z, cmap, lightsource)
 
         polys = []
         # Only need these vectors to shade if there is no cmap
-        if cmap is None and shade :
+        if cmap is None and shade:
             totpts = int(np.ceil((rows - 1) / rstride) *
                          np.ceil((cols - 1) / cstride))
             v1 = np.empty((totpts, 3))
@@ -1711,8 +1707,8 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
                 avgzsum = sum(p[2] for p in ps2)
                 polys.append(ps2)
 
-                if fcolors is not None:
-                    colset.append(fcolors[rs][cs])
+                if facecolors is not None:
+                    colset.append(facecolors[rs][cs])
                 else:
                     colset.append(avgzsum / len(ps2))
 
@@ -1729,7 +1725,7 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
 
         polyc = art3d.Poly3DCollection(polys, *args, **kwargs)
 
-        if fcolors is not None:
+        if facecolors is not None:
             if shade:
                 colset = self._shade_colors(colset, normals)
             polyc.set_facecolors(colset)
