Changeset 8053

Timestamp:

Oct 29, 2010, 11:00:13 AM (14 years ago)

Author:

habili

Message:

Addition of line intersect code. This will determine which triangles intersect or which triangle contains a line.

File:

• trunk/anuga_core/source/anuga/geometry/polygon.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/geometry/polygon.py

@@ -257 +257 @@
     return indices[count:]    
 
-def polyline_overlap(triangles, polyline, verbose=False):
+def line_intersect(triangles, line, verbose=False):
     """Determine if a polygon and triangle overlap
 
     """
-    polyline = ensure_numeric(polyline)
+    line = ensure_numeric(line)
     triangles = ensure_numeric(triangles)
     
@@ -268 +268 @@
     indices = num.zeros(M, num.int)
 
-    count = _polyline_overlap(polyline, triangles, indices)
+    count = _line_intersect(line, triangles, indices)
 
     if verbose:
-        log.critical('Found %d triangles (out of %d) that polygon' % (count, M))
+        log.critical('Found %d triangles (out of %d) that overlap the polygon' % (count, M))
 
     return indices[:count]
     
-def not_polyline_overlap(triangles, polyline, verbose=False):
+def not_line_intersect(triangles, line, verbose=False):
     """Determine if a polyline and triangle overlap
 
     """
-    polyline = ensure_numeric(polyline)
+    line = ensure_numeric(line)
     triangles = ensure_numeric(triangles)
     
@@ -286 +286 @@
     indices = num.zeros(M, num.int)
 
-    count = _polyline_overlap(polyline, triangles, indices)
+    count = _line_intersect(line, triangles, indices)
 
     if verbose:
-        log.critical('Found %d triangles (out of %d) that polygon' % (count, M))
+        log.critical('Found %d triangles (out of %d) that intersect the line' % (count, M))
 
     return indices[count:]    
@@ -1172 +1172 @@
     from polygon_ext import _interpolate_polyline    
     from polygon_ext import _polygon_overlap
-    from polygon_ext import _polyline_overlap
+    from polygon_ext import _line_intersect
     from polygon_ext import _is_inside_triangle        
     #from polygon_ext import _intersection