Add "filled" kwarg to path_intersects_path

mdboom · mdboom · commit 2ec7b677df8f · 2008-09-10T12:33:33.000Z
svn path=/trunk/matplotlib/; revision=6078
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,10 @@
+2008-09-10 Add "filled" kwarg to Path.intersects_path and
+           Path.intersects_bbox. - MGD
+
 2008-09-07 Changed full arrows slightly to avoid an xpdf rendering
            problem reported by Friedrich Hagedorn. - JKS
 
-2008-09-07 Fix conversion of quadratic to cubic Bezier curves in PDF 
+2008-09-07 Fix conversion of quadratic to cubic Bezier curves in PDF
            and PS backends. Patch by Jae-Joon Lee. - JKS
 
 2008-09-06 Added 5-point star marker to plot command - EF
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -242,21 +242,29 @@ def get_extents(self, transform=None):
             transform = transform.frozen()
         return Bbox(get_path_extents(self, transform))
 
-    def intersects_path(self, other):
+    def intersects_path(self, other, filled=True):
         """
         Returns *True* if this path intersects another given path.
+
+        *filled*, when True, treats the paths as if they were filled.
+         That is, if one path completely encloses the other,
+         :meth:`intersects_path` will return True.
         """
-        return path_intersects_path(self, other)
+        return path_intersects_path(self, other, filled)
 
-    def intersects_bbox(self, bbox):
+    def intersects_bbox(self, bbox, filled=True):
         """
         Returns *True* if this path intersects a given
         :class:`~matplotlib.transforms.Bbox`.
+
+        *filled*, when True, treats the path as if it was filled.
+        That is, if one path completely encloses the other,
+        :meth:`intersects_path` will return True.
         """
         from transforms import BboxTransformTo
         rectangle = self.unit_rectangle().transformed(
             BboxTransformTo(bbox))
-        result = self.intersects_path(rectangle)
+        result = self.intersects_path(rectangle, filled)
         return result
 
     def interpolated(self, steps):
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -1081,14 +1081,22 @@ bool path_intersects_path(PathIterator& p1, PathIterator& p2)
 
 Py::Object _path_module::path_intersects_path(const Py::Tuple& args)
 {
-    args.verify_length(2);
+    args.verify_length(2, 3);
 
     PathIterator p1(args[0]);
     PathIterator p2(args[1]);
+    bool filled = false;
+    if (args.size() == 3) {
+      filled = args[2].isTrue();
+    }
 
-    return Py::Int(::path_intersects_path(p1, p2)
-                   || ::path_in_path(p1, agg::trans_affine(), p2, agg::trans_affine())
-                   || ::path_in_path(p2, agg::trans_affine(), p1, agg::trans_affine()));
+    if (!filled) {
+      return Py::Int(::path_intersects_path(p1, p2));
+    } else {
+      return Py::Int(::path_intersects_path(p1, p2)
+        || ::path_in_path(p1, agg::trans_affine(), p2, agg::trans_affine())
+        || ::path_in_path(p2, agg::trans_affine(), p1, agg::trans_affine()));
+    }
 }
 
 void _add_polygon(Py::List& polygons, const std::vector<double>& polygon) {
