Merge pull request #1114 from dmcdougall/alpha

mdboom · mdboom · commit b0393e97eaeb · 2012-08-23T08:23:04.000-07:00
Make grid accept alpha rcParam
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -412,6 +412,7 @@ def _get_gridline(self):
                    color=rcParams['grid.color'],
                    linestyle=rcParams['grid.linestyle'],
                    linewidth=rcParams['grid.linewidth'],
+                   alpha=rcParams['grid.alpha'],
                    )
         l.set_transform(self.axes.get_xaxis_transform(which='grid'))
         l.get_path()._interpolation_steps = GRIDLINE_INTERPOLATION_STEPS
@@ -550,6 +551,7 @@ def _get_gridline(self):
                     color=rcParams['grid.color'],
                     linestyle=rcParams['grid.linestyle'],
                     linewidth=rcParams['grid.linewidth'],
+                    alpha=rcParams['grid.alpha'],
                     )
 
         l.set_transform(self.axes.get_yaxis_transform(which='grid'))
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -539,6 +539,7 @@ def __call__(self, s):
     'grid.color'       : ['k', validate_color],       # grid color
     'grid.linestyle'   : [':', str],       # dotted
     'grid.linewidth'   : [0.5, validate_float],     # in points
+    'grid.alpha'       : [1.0, validate_float],
 
 
     # figure props
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -271,6 +271,7 @@ text.hinting_factor : 8 # Specifies the amount of softness for hinting in the
 #grid.color       :   black   # grid color
 #grid.linestyle   :   :       # dotted
 #grid.linewidth   :   0.5     # in points
+#grid.alpha       :   1.0     # transparency, between 0.0 and 1.0
 
 ### Legend
 #legend.fancybox      : False  # if True, use a rounded box for the

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,7 @@ def _get_gridline(self):`
`412`	`412`	`color=rcParams['grid.color'],`
`413`	`413`	`linestyle=rcParams['grid.linestyle'],`
`414`	`414`	`linewidth=rcParams['grid.linewidth'],`
	`415`	`+ alpha=rcParams['grid.alpha'],`
`415`	`416`	`)`
`416`	`417`	`l.set_transform(self.axes.get_xaxis_transform(which='grid'))`
`417`	`418`	`l.get_path()._interpolation_steps = GRIDLINE_INTERPOLATION_STEPS`
`@@ -550,6 +551,7 @@ def _get_gridline(self):`
`550`	`551`	`color=rcParams['grid.color'],`
`551`	`552`	`linestyle=rcParams['grid.linestyle'],`
`552`	`553`	`linewidth=rcParams['grid.linewidth'],`
	`554`	`+ alpha=rcParams['grid.alpha'],`
`553`	`555`	`)`
`554`	`556`
`555`	`557`	`l.set_transform(self.axes.get_yaxis_transform(which='grid'))`