first commit to allow fillstyle none

Craig M · Craig M · commit 213459eabb44 · 2011-08-31T12:12:32.000-06:00
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -305,9 +305,9 @@ def get_fillstyle(self):
     def set_fillstyle(self, fs):
         """
         Set the marker fill style; 'full' means fill the whole marker.
-        The other options are for half filled markers
+        'none' means no filling; other options are for half-filled markers.
 
-        ACCEPTS: ['full' | 'left' | 'right' | 'bottom' | 'top']
+        ACCEPTS: ['full' | 'left' | 'right' | 'bottom' | 'top' | 'none']
         """
         self._marker.set_fillstyle(fs)
 
@@ -585,10 +585,11 @@ def _get_markerfacecolor(self, alt=False):
         else:
             fc = self._markerfacecolor
 
-        if (fc is None or (is_string_like(fc) and fc.lower()=='none') ):
-            return fc
-        elif (is_string_like(fc) and fc.lower() == 'auto'):
-            return self._color
+        if (is_string_like(fc) and fc.lower() == 'auto'):
+            if self.get_fillstyle() == 'none':
+                return 'none'
+            else:
+                return self._color
         else:
             return fc
 
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -101,13 +101,12 @@ class MarkerStyle:
     filled_markers = (
         'o', 'v', '^', '<', '>', '8', 's', 'p', '*', 'h', 'H', 'D', 'd')
         
-    fillstyles = ('full', 'left' , 'right' , 'bottom' , 'top')
+    fillstyles = ('full', 'left' , 'right' , 'bottom' , 'top', 'none')
 
     # TODO: Is this ever used as a non-constant?
     _point_size_reduction = 0.5
     
     def __init__(self, marker=None, fillstyle='full'):
-        self._fillstyle = fillstyle
         self.set_marker(marker)
         self.set_fillstyle(fillstyle)
 
@@ -329,7 +328,7 @@ def _set_square(self):
         self._transform = Affine2D().translate(-0.5, -0.5)
         self._snap_threshold = 2.0
         fs = self.get_fillstyle()
-        if fs=='full':
+        if fs == 'full' or fs == 'none':
             self._path = Path.unit_rectangle()
         else:
             # build a bottom filled square out of two rectangles, one
@@ -349,7 +348,7 @@ def _set_diamond(self):
         self._transform = Affine2D().translate(-0.5, -0.5).rotate_deg(45)
         self._snap_threshold = 5.0
         fs = self.get_fillstyle()
-        if fs=='full':
+        if fs == 'full' or fs == 'none':
             self._path = Path.unit_rectangle()
         else:
             self._path = Path([[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 0.0]])
@@ -374,7 +373,7 @@ def _set_pentagon(self):
         polypath = Path.unit_regular_polygon(5)
         fs = self.get_fillstyle()
 
-        if fs == 'full':
+        if fs == 'full' or fs == 'none':
             self._path = polypath
         else:
             verts = polypath.vertices
@@ -404,7 +403,7 @@ def _set_star(self):
         fs = self.get_fillstyle()
         polypath = Path.unit_regular_star(5, innerCircle=0.381966)
 
-        if fs == 'full':
+        if fs == 'full' or fs == 'none':
             self._path = polypath
         else:
             verts = polypath.vertices
@@ -433,7 +432,7 @@ def _set_hexagon1(self):
         fs = self.get_fillstyle()
         polypath = Path.unit_regular_polygon(6)
 
-        if fs == 'full':
+        if fs == 'full' or fs == 'none':
             self._path = polypath
         else:
             verts = polypath.vertices
@@ -465,7 +464,7 @@ def _set_hexagon2(self):
         fs = self.get_fillstyle()
         polypath = Path.unit_regular_polygon(6)
 
-        if fs == 'full':
+        if fs == 'full' or fs == 'none':
             self._path = polypath
         else:
             verts = polypath.vertices
@@ -497,7 +496,7 @@ def _set_octagon(self):
         fs = self.get_fillstyle()
         polypath = Path.unit_regular_polygon(8)
 
-        if fs == 'full':
+        if fs == 'full' or fs == 'none':
             self._transform.rotate_deg(22.5)
             self._path = polypath
         else:
