New path-related utilities (used for an aborted attempt at fixing

mdboom · mdboom · commit 943c74906db4 · 2007-11-14T18:44:39.000Z
contouring -- may be useful in other contexts in the future).

svn path=/branches/transforms/; revision=4286
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -152,7 +152,7 @@ def set_facecolor(self, color):
         ACCEPTS: any matplotlib color
         """
         self._facecolor = color
-
+        
     def set_linewidth(self, w):
         """
         Set the patch linewidth in points
@@ -522,6 +522,28 @@ def get_path(self):
     def get_patch_transform(self):
         return self._poly_transform
 	
+class PathPatch(Patch):
+    """
+    A general polycurve path patch.
+    """
+    def __str__(self):
+        return "Poly((%g, %g) ...)" % tuple(self._path.vertices[0])
+
+    def __init__(self, path, **kwargs):
+        """
+        path is a Path object
+        
+        Valid kwargs are:
+        %(Patch)s
+        See Patch documentation for additional kwargs
+        """
+        Patch.__init__(self, **kwargs)
+	self._path = path
+    __init__.__doc__ = cbook.dedent(__init__.__doc__) % artist.kwdocd
+
+    def get_path(self):
+	return self._path
+
 class Polygon(Patch):
     """
     A general polygon patch.
@@ -549,7 +571,7 @@ def _get_xy(self):
     def _set_xy(self, vertices):
         self._path = Path(vertices)
     xy = property(_get_xy, _set_xy)
-        
+    
 class Wedge(Patch):
     def __str__(self):
         return "Wedge(%g,%g)"%self.xy[0]
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -11,8 +11,8 @@
 from matplotlib.numerix import npyma as ma
 
 from matplotlib._path import point_in_path, get_path_extents, \
-    point_in_path_collection
-import matplotlib._path as _path
+    point_in_path_collection, get_path_collection_extents, \
+    path_in_path
 from matplotlib.cbook import simple_linear_interpolation
 
 KAPPA = 4.0 * (npy.sqrt(2) - 1) / 3.0
@@ -128,6 +128,30 @@ def __init__(self, vertices, codes=None):
         self.codes = codes
 	self.vertices = vertices
 
+    #@staticmethod
+    def make_compound_path(*args):
+        """
+        Make a compound path from a list of Path objects.  Only
+        polygons (not curves) are supported.
+        """
+        for p in args:
+            assert p.codes is None
+
+        lengths = [len(x) for x in args]
+        total_length = sum(lengths)
+
+        vertices = npy.vstack([x.vertices for x in args])
+        vertices.reshape((total_length, 2))
+        
+        codes = Path.LINETO * npy.ones(total_length)
+        i = 0
+        for length in lengths:
+            codes[i] = Path.MOVETO
+            i += length
+            
+        return Path(vertices, codes)
+    make_compound_path = staticmethod(make_compound_path)
+    
     def __repr__(self):
 	return "Path(%s, %s)" % (self.vertices, self.codes)
 
@@ -186,9 +210,18 @@ def contains_point(self, point, transform=None):
         """
         if transform is None:
             from transforms import IdentityTransform
-            transform = IdentityTransform
+            transform = IdentityTransform()
         return point_in_path(point[0], point[1], self, transform.frozen())
 
+    def contains_path(self, path, transform=None):
+        """
+        Returns True if this path completely contains the given path.
+        """
+        if transform is None:
+            from transforms import IdentityTransform
+            transform = IdentityTransform()
+        return path_in_path(self, IdentityTransform(), path, transform)
+        
     def get_extents(self, transform=None):
         """
         Returns the extents (xmin, ymin, xmax, ymax) of the path.
@@ -408,8 +441,9 @@ def wedge(cls, theta1, theta2):
         return cls.arc(theta1, theta2, True)
     wedge = classmethod(wedge)
 
+_get_path_collection_extents = get_path_collection_extents
 def get_path_collection_extents(*args):
     from transforms import Bbox
     if len(args[1]) == 0:
         raise ValueError("No paths provided")
-    return Bbox.from_extents(*_path.get_path_collection_extents(*args))
+    return Bbox.from_extents(*_get_path_collection_extents(*args))
diff --git a/src/_path.cpp b/src/_path.cpp
