matplotlib
diff --git a/‎lib/mpl_toolkits/mplot3d/axes3d.py
+44-6 b/‎lib/mpl_toolkits/mplot3d/axes3d.py
+44-6
diff --git a/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/mixedsubplot.pdf
-6.2 KB b/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/mixedsubplot.pdf
-6.2 KB
@@ -1553,7 +1553,7 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
 
         The `rstride` and `cstride` kwargs set the stride used to
         sample the input data to generate the graph.  If 1k by 1k
-        arrays are passed in the default values for the strides will
+        arrays are passed in, the default values for the strides will
         result in a 100x100 grid being plotted. Defaults to 10.
         Raises a ValueError if both stride and count kwargs
         (see next section) are provided.
@@ -1596,7 +1596,7 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
         rows, cols = Z.shape
 
         has_stride = 'rstride' in kwargs or 'cstride' in kwargs
-        has_count = 'rcount' in kwargs or 'rcount' in kwargs
+        has_count = 'rcount' in kwargs or 'ccount' in kwargs
 
         if has_stride and has_count:
             raise ValueError("Cannot specify both stride and count arguments")
@@ -1768,7 +1768,21 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
         The `rstride` and `cstride` kwargs set the stride used to
         sample the input data to generate the graph. If either is 0
         the input data in not sampled along this direction producing a
-        3D line plot rather than a wireframe plot.
+        3D line plot rather than a wireframe plot. The stride arguments
+        are only used by default if in the 'classic' mode. They are
+        now superceeded by `rcount` and `ccount`. Will raise ValueError
+        if both stride and count are used.
+
+`       The `rcount` and `ccount` kwargs supersedes `rstride` and
+        `cstride`for default sampling method for wireframe plotting.
+        These arguments will determine at most how many evenly spaced
+        samples will be taken from the input data to generate the graph.
+        This is the default sampling method unless using the 'classic'
+        style. Will raise ValueError if both stride and count are
+        specified. If either is zero, then the input data is not sampled
+        along this direction, producing a 3D line plot rather than a
+        wireframe plot.
+        Added in v2.0.0.
 
         ==========  ================================================
         Argument    Description
@@ -1777,6 +1791,8 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
         *Z*
         *rstride*   Array row stride (step size), defaults to 1
         *cstride*   Array column stride (step size), defaults to 1
+        *rcount*    Use at most this many rows, defaults to 50
+        *ccount*    Use at most this many columns, defaults to 50
         ==========  ================================================
 
         Keyword arguments are passed on to
@@ -1785,15 +1801,37 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
         Returns a :class:`~mpl_toolkits.mplot3d.art3d.Line3DCollection`
         '''
 
-        rstride = kwargs.pop("rstride", 1)
-        cstride = kwargs.pop("cstride", 1)
-
         had_data = self.has_data()
         Z = np.atleast_2d(Z)
         # FIXME: Support masked arrays
         X, Y, Z = np.broadcast_arrays(X, Y, Z)
         rows, cols = Z.shape
 
+        has_stride = 'rstride' in kwargs or 'cstride' in kwargs
+        has_count = 'rcount' in kwargs or 'ccount' in kwargs
+
+        if has_stride and has_count:
+            raise ValueError("Cannot specify both stride and count arguments")
+
+        rstride = kwargs.pop('rstride', 1)
+        cstride = kwargs.pop('cstride', 1)
+        rcount = kwargs.pop('rcount', 50)
+        ccount = kwargs.pop('ccount', 50)
+
+        if rcParams['_internal.classic_mode']:
+            # Strides have priority over counts in classic mode.
+            # So, only compute strides from counts
+            # if counts were explicitly given
+            if has_count:
+                rstride = int(np.ceil(rows / rcount)) if rcount else 0
+                cstride = int(np.ceil(cols / ccount)) if ccount else 0
+        else:
+            # If the strides are provided then it has priority.
+            # Otherwise, compute the strides from the counts.
+            if not has_stride:
+                rstride = int(np.ceil(rows / rcount)) if rcount else 0
+                cstride = int(np.ceil(cols / ccount)) if ccount else 0
+
         # We want two sets of lines, one running along the "rows" of
         # Z and another set of lines running along the "columns" of Z.
         # This transpose will make it easy to obtain the columns.