Merged revisions 8636 via svnmerge from

mdboom · mdboom · commit 10029958d2d2 · 2010-08-16T19:57:25.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8636 | mdboom | 2010-08-16 15:56:27 -0400 (Mon, 16 Aug 2010) | 4 lines Add explicit "CLOSEPOLY" codes to unit_rectangle, unit_polygon, unit_star and unit_asterisk. Not doing so causes the strokes to have the wrong end cap at the beginning/end point. ........ svn path=/trunk/matplotlib/; revision=8637
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -384,7 +384,8 @@ def unit_rectangle(cls):
         """
         if cls._unit_rectangle is None:
             cls._unit_rectangle = \
-                cls([[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [0.0, 0.0]])
+                cls([[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [0.0, 0.0]],
+                    [cls.MOVETO, cls.LINETO, cls.LINETO, cls.LINETO, cls.CLOSEPOLY])
         return cls._unit_rectangle
 
     _unit_regular_polygons = WeakValueDictionary()
@@ -407,8 +408,13 @@ def unit_regular_polygon(cls, numVertices):
             # "points-up"
             theta += np.pi / 2.0
             verts = np.concatenate((np.cos(theta), np.sin(theta)), 1)
-            path = cls(verts)
-            cls._unit_regular_polygons[numVertices] = path
+            codes = np.empty((numVertices,))
+            codes[0] = cls.MOVETO
+            codes[1:-1] = cls.LINETO
+            codes[-1] = cls.CLOSEPOLY
+            path = cls(verts, codes)
+            if numVertices <= 16:
+                cls._unit_regular_polygons[numVertices] = path
         return path
 
     _unit_regular_stars = WeakValueDictionary()
@@ -433,8 +439,13 @@ def unit_regular_star(cls, numVertices, innerCircle=0.5):
             r = np.ones(ns2 + 1)
             r[1::2] = innerCircle
             verts = np.vstack((r*np.cos(theta), r*np.sin(theta))).transpose()
+            codes = np.empty((ns2,))
+            codes[0] = cls.MOVETO
+            codes[1:-1] = cls.LINETO
+            codes[-1] = cls.CLOSEPOLY
             path = cls(verts)
-            cls._unit_regular_polygons[(numVertices, innerCircle)] = path
+            if numVertices <= 16:
+                cls._unit_regular_polygons[(numVertices, innerCircle)] = path
         return path
 
     @classmethod
