Implement fill style for octagon marker.

mdboom · mdboom · commit 83da58e6452f · 2011-07-15T14:25:18.000-04:00
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -465,18 +465,29 @@ def _set_hexagon2(self):
             self._alt_transform = self._transform
 
     def _set_octagon(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(22.5)
+        self._transform = Affine2D().scale(0.5)
         self._snap_threshold = 5.0
         
         fs = self.get_fillstyle()
         polypath = Path.unit_regular_polygon(8)
 
         if fs == 'full':
+            self._transform.rotate_deg(22.5)
             self._path = polypath
         else:
-            # TODO: Implement partially-filled octagons
-            self._path = polypath
-            
+            x = np.sqrt(2.)/4.
+            half = Path([[0, -1], [0, 1], [-x, 1], [-1, x],
+                         [-1, -x], [-x, -1], [0, -1]])
+
+            if fs=='bottom': rotate = 90.
+            elif fs=='top': rotate = 270.
+            elif fs=='right': rotate = 180.
+            else: rotate = 0.
+
+            self._transform.rotate_deg(rotate)
+            self._path = self._alt_path = half
+            self._alt_transform = self._transform.frozen().rotate_deg(180.0)
+
     _line_marker_path = Path([[0.0, -1.0], [0.0, 1.0]])
     def _set_vline(self):
         self._transform = Affine2D().scale(0.5)
