Axes.grid controls minor and/or major lines; axis.grid allows 'both'

efiring · efiring · commit 711c63a29e78 · 2010-06-09T17:57:36.000Z
svn path=/trunk/matplotlib/; revision=8402
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2010-06-09 Allow Axes.grid to control minor gridlines; allow
+           Axes.grid and Axis.grid to control major and minor
+           gridlines in the same method call. - EF
+
 2010-06-06 Change the way we do split/dividend adjustments in
            finance.py to handle dividends and fix the zero division bug reported
            in sf bug 2949906.  Note that volume is not adjusted
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1957,18 +1957,21 @@ def set_axisbelow(self, b):
         self._axisbelow = b
 
     @docstring.dedent_interpd
-    def grid(self, b=None, **kwargs):
+    def grid(self, b=None, which='major', **kwargs):
         """
         call signature::
 
-          grid(self, b=None, **kwargs)
+          grid(self, b=None, which='major', **kwargs)
 
         Set the axes grids on or off; *b* is a boolean.  (For Matlab
         compatibility, *b* may also be a string, 'on' or 'off'.)
 
         If *b* is *None* and ``len(kwargs)==0``, toggle the grid state.  If
         *kwargs* are supplied, it is assumed that you want a grid and *b*
-        is thus set to *True*
+        is thus set to *True*.
+
+        *which* can be 'major' (default), 'minor', or 'both' to control
+        whether major tick grids, minor tick grids, or both are affected.
 
         *kawrgs* are used to set the grid line properties, eg::
 
@@ -1981,8 +1984,8 @@ def grid(self, b=None, **kwargs):
         if len(kwargs):
             b = True
         b = _string_to_bool(b)
-        self.xaxis.grid(b, **kwargs)
-        self.yaxis.grid(b, **kwargs)
+        self.xaxis.grid(b, which=which, **kwargs)
+        self.yaxis.grid(b, which=which, **kwargs)
 
     def ticklabel_format(self, **kwargs):
         """
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1002,7 +1002,7 @@ def get_minor_ticks(self, numticks=None):
     def grid(self, b=None, which='major', **kwargs):
         """
         Set the axis grid on or off; b is a boolean. Use *which* =
-        'major' | 'minor' to set the grid for major or minor ticks.
+        'major' | 'minor' | 'both' to set the grid for major or minor ticks.
 
         If *b* is *None* and len(kwargs)==0, toggle the grid state.  If
         *kwargs* are supplied, it is assumed you want the grid on and *b*
@@ -1013,14 +1013,15 @@ def grid(self, b=None, which='major', **kwargs):
           xax.grid(color='r', linestyle='-', linewidth=2)
         """
         if len(kwargs): b = True
-        if which.lower().find('minor')>=0:
+        which = which.lower()
+        if which in ['minor', 'both']:
             if b is None: self._gridOnMinor = not self._gridOnMinor
             else: self._gridOnMinor = b
             for tick in self.minorTicks:  # don't use get_ticks here!
                 if tick is None: continue
                 tick.gridOn = self._gridOnMinor
                 if len(kwargs): artist.setp(tick.gridline,**kwargs)
-        if which.lower().find('major')>=0:
+        if which in ['major', 'both']:
             if b is None: self._gridOnMajor = not self._gridOnMajor
             else: self._gridOnMajor = b
             for tick in self.majorTicks:  # don't use get_ticks here!
