Merge pull request #3602 from nkoep/markers-fillstyle-rcparams

WeatherGod · WeatherGod · commit 42f09b6e223a · 2015-06-24T12:34:06.000-04:00
Add rcParams support for markers' fillstyle prop
diff --git a/doc/users/whats_new/rcparams.rst b/doc/users/whats_new/rcparams.rst
@@ -37,6 +37,10 @@ multiple images on a set of axes into a single composite image.  Saving each
 image individually can be useful if you generate vector graphics files in
 matplotlib and then edit the files further in Inkscape or other programs.
 
+Added ``markers.fillstyle`` key to rcParams
+```````````````````````````````````````````
+Controls the default fillstyle of markers. Possible values are ``'full'`` (the
+default), ``'left'``, ``'right'``, ``'bottom'``, ``'top'`` and ``'none'``.
 
 Added "toolmanager" to "toolbar" possible values
 ````````````````````````````````````````````````
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -256,7 +256,7 @@ def __init__(self, xdata, ydata,
                  markeredgecolor=None,
                  markerfacecolor=None,
                  markerfacecoloralt='none',
-                 fillstyle='full',
+                 fillstyle=None,
                  antialiased=None,
                  dash_capstyle=None,
                  solid_capstyle=None,
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -145,7 +145,7 @@ class MarkerStyle(object):
     # TODO: Is this ever used as a non-constant?
     _point_size_reduction = 0.5
 
-    def __init__(self, marker=None, fillstyle='full'):
+    def __init__(self, marker=None, fillstyle=None):
         """
         MarkerStyle
 
@@ -165,6 +165,8 @@ def __init__(self, marker=None, fillstyle='full'):
         fillstyle : string, optional, default: 'full'
             'full', 'left", 'right', 'bottom', 'top', 'none'
         """
+        # The fillstyle has to be set here as it might be accessed by calls to
+        # _recache() in set_marker.
         self._fillstyle = fillstyle
         self.set_marker(marker)
         self.set_fillstyle(fillstyle)
@@ -211,6 +213,8 @@ def set_fillstyle(self, fillstyle):
         ----------
         fillstyle : string amongst known fillstyles
         """
+        if fillstyle is None:
+            fillstyle = rcParams['markers.fillstyle']
         if fillstyle not in self.fillstyles:
             raise ValueError("Unrecognized fillstyle %s"
                              % ' '.join(self.fillstyles))
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -392,6 +392,10 @@ def validate_ps_distiller(s):
                                       ['butt', 'round', 'projecting'],
                                       ignorecase=True)
 
+validate_fillstyle = ValidateInStrings('markers.fillstyle',
+                                       ['full', 'left', 'right', 'bottom',
+                                        'top', 'none'])
+
 validate_negative_linestyle = ValidateInStrings('negative_linestyle',
                                                 ['solid', 'dashed'],
                                                 ignorecase=True)
@@ -552,6 +556,9 @@ def __call__(self, s):
     'lines.dash_capstyle':   ['butt', validate_capstyle],
     'lines.solid_capstyle':  ['projecting', validate_capstyle],
 
+    # marker props
+    'markers.fillstyle': ['full', validate_fillstyle],
+
     ## patch props
     'patch.linewidth':   [1.0, validate_float],  # line width in points
     'patch.edgecolor':   ['k', validate_color],  # black
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/rc_markerfill.png b/lib/matplotlib/tests/baseline_images/test_axes/rc_markerfill.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2366,6 +2366,16 @@ def test_marker_styles():
                 markersize=10+y/5, label=marker)
 
 
+@image_comparison(baseline_images=['rc_markerfill'], extensions=['png'])
+def test_markers_fillstyle_rcparams():
+    fig, ax = plt.subplots()
+    x = np.arange(7)
+    for idx, (style, marker) in enumerate(
+        [('top', 's'), ('bottom', 'o'), ('none', '^')]):
+        matplotlib.rcParams['markers.fillstyle'] = style
+        ax.plot(x+idx, marker=marker)
+
+
 @image_comparison(baseline_images=['vertex_markers'], extensions=['png'],
                   remove_text=True)
 def test_vertex_markers():
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -90,6 +90,8 @@ backend      : %(backend)s
 #lines.solid_capstyle : projecting   # butt|round|projecting
 #lines.antialiased : True         # render lines in antialised (no jaggies)
 
+#markers.fillstyle: full # full|left|right|bottom|top|none
+
 ### PATCHES
 # Patches are graphical objects that fill 2D space, like polygons or
 # circles.  See
@@ -256,10 +258,10 @@ backend      : %(backend)s
                                    # separator in the fr_FR locale.
 #axes.formatter.use_mathtext : False # When True, use mathtext for scientific
                                      # notation.
-#axes.formatter.useoffset      : True    # If True, the tick label formatter 
-                                         # will default to labeling ticks relative 
-                                         # to an offset when the data range is very 
-                                         # small compared to the minimum absolute 
+#axes.formatter.useoffset      : True    # If True, the tick label formatter
+                                         # will default to labeling ticks relative
+                                         # to an offset when the data range is very
+                                         # small compared to the minimum absolute
                                          # value of the data.
 
 #axes.unicode_minus  : True    # use unicode for the minus symbol
@@ -410,7 +412,7 @@ backend      : %(backend)s
 #savefig.jpeg_quality: 95       # when a jpeg is saved, the default quality parameter.
 #savefig.directory   : ~        # default directory in savefig dialog box,
                                 # leave empty to always use current working directory
-#savefig.transparent : False    # setting that controls whether figures are saved with a 
+#savefig.transparent : False    # setting that controls whether figures are saved with a
                                 # transparent background by default
 
 # tk backend params
@@ -500,5 +502,5 @@ backend      : %(backend)s
                                    # $PATH is searched
 #animation.mencoder_args: ''       # Additional arguments to pass to mencoder
 #animation.convert_path: 'convert' # Path to ImageMagick's convert binary.
-                                   # On Windows use the full path since convert 
+                                   # On Windows use the full path since convert
                                    # is also the name of a system tool.
