Changeset 988 for inundation/ga/storm_surge/pmesh/mesh.py

Timestamp:

Mar 2, 2005, 2:11:28 PM (20 years ago)

Author:

duncan

Message:

change in alpha interface

File:

• inundation/ga/storm_surge/pmesh/mesh.py (modified) (3 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -1205 +1205 @@
         self.userSegments.extend(newsegs)
         return newsegs
-     
-    def autoSegment(self, alpha = None, boundary_type=REMOVE_PINCH_OFF): 
+    def autoSegmentFilter(self,):
+        pass
+    
+    def autoSegment(self, alpha = None,
+                                 raw_boundary=True,
+                                 remove_holes=False,
+                                 smooth_indents=False,
+                                 expand_pinch=False): 
         """
         Precon: There must be 3 or more vertices in the userVertices structure
@@ -1214 +1220 @@
         for vertex in self.getUserVertices():
             points.append((vertex.x,vertex.y))
-        shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
-        shape.set_boundary_type(flag = boundary_type)
-        boundary_segs = shape.get_boundary()
+        self.shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
+        self.shape.set_boundary_type(raw_boundary=raw_boundary,
+                                 remove_holes=remove_holes,
+                                 smooth_indents=smooth_indents,
+                                 expand_pinch=expand_pinch)
+        boundary_segs = self.shape.get_boundary()
 
         segs2delete = self.alphaUserSegments
-        #for neededseg in boundary_segs:
-        #    try:
-         #     segs2delete.remove(neededseg)
-         #     print "list delete",neededseg
-         #   except:
-         #       print "list don't delete",neededseg
-        #addback = []
-        #for delseg in segs2delete:
-        #    print "boundary_segs.count(delseg)",boundary_segs.count(delseg)
-        #    if boundary_segs.count(delseg) > 0:
-        #        #Don't delete this seg.  We need it for the new boundary
-        #        addback.append(delseg)
-        #for seg in addback:
-        #    segs2delete.remove(seg)
                 
         new_segs = []
@@ -1262 +1257 @@
         self.alphaUserSegments.extend(alpha_segs)
 
-        optimum_alpha = shape.get_alpha()
+        optimum_alpha = self.shape.get_alpha()
         # need to draw newsegs
         return new_segs, segs2delete, optimum_alpha