Fix polygon closing and provide option not to close (used by hist(histtype="step"))

mdboom · mdboom · commit 676f82aad4e4 · 2008-06-06T12:57:24.000Z
svn path=/trunk/matplotlib/; revision=5410
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-06-06 Fix closed polygon patch and also provide the option to
+           not close the polygon - MGD
+
 2008-06-05 Fix some dpi-changing-related problems with PolyCollection,
            as called by Axes.scatter() - MGD
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -345,12 +345,16 @@ def makefill(x, y):
                 seg = mpatches.Polygon(zip(x, y),
                               facecolor = facecolor,
                               fill=True,
+                              closed=closed
                               )
                 self.set_patchprops(seg, **kwargs)
                 ret.append(seg)
 
-            if self.command == 'plot': func = makeline
-            else:                      func = makefill
+            if self.command == 'plot':
+                func = makeline
+            else:
+                closed = kwargs.pop("closed")
+                func = makefill
             if multicol:
                 for j in range(y.shape[1]):
                     func(x[:,j], y[:,j])
@@ -387,12 +391,16 @@ def makefill(x, y):
             seg = mpatches.Polygon(zip(x, y),
                           facecolor = facecolor,
                           fill=True,
+                          closed=closed
                           )
             self.set_patchprops(seg, **kwargs)
             ret.append(seg)
 
-        if self.command == 'plot': func = makeline
-        else:                      func = makefill
+        if self.command == 'plot':
+            func = makeline
+        else:
+            closed = kwargs.pop('closed')
+            func = makefill
 
         if multicol:
             for j in range(y.shape[1]):
@@ -4934,6 +4942,8 @@ def fill(self, *args, **kwargs):
 
         See examples/fill_between.py for more examples.
 
+        The closed kwarg will close the polygon when True (default).
+
         kwargs control the Polygon properties:
         %(Polygon)s
         """
@@ -5809,7 +5819,7 @@ def hist(self, x, bins=10, normed=False, cumulative=False,
                     x,y = y,x
                 elif orientation != 'vertical':
                     raise ValueError, 'invalid orientation: %s' % orientation
-                patches.append( self.fill(x,y) )
+                patches.append( self.fill(x,y,closed=False) )
 
             # adopted from adjust_x/ylim part of the bar method
             if orientation == 'horizontal':
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -531,7 +531,7 @@ class Polygon(Patch):
     def __str__(self):
         return "Poly((%g, %g) ...)" % tuple(self._path.vertices[0])
 
-    def __init__(self, xy, **kwargs):
+    def __init__(self, xy, closed=True, **kwargs):
         """
         xy is a numpy array with shape Nx2
 
@@ -541,7 +541,7 @@ def __init__(self, xy, **kwargs):
         """
         Patch.__init__(self, **kwargs)
         xy = np.asarray(xy, np.float_)
-        if len(xy) and xy[0] != xy[-1]:
+        if closed and len(xy) and (xy[0] != xy[-1]).any():
                 xy = np.concatenate([xy, [xy[0]]])
         self._path = Path(xy)
     __init__.__doc__ = cbook.dedent(__init__.__doc__) % artist.kwdocd
