Changeset 958

Timestamp:

Feb 25, 2005, 1:44:53 PM (20 years ago)

Author:

duncan

Message:

adding more alpha shape control

Location:

inundation/ga/storm_surge/pmesh

Files:

• mesh.py (modified) (3 diffs)
• pmesh.py (modified) (5 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -30 +30 @@
 SET_COLOUR='red'
 
+
+#for alpha shapes boundary type
+RAW = 0
+REMOVE_HOLES = 1
+REMOVE_SHARP_INDENTS = 2
+REMOVE_PINCH_OFF = 3
 
 
@@ -1192 +1198 @@
         return newsegs
      
-    def autoSegment(self, alpha = None):
+    def autoSegment(self, alpha = None, boundary_type=REMOVE_PINCH_OFF): 
         """
         Precon: There must be 3 or more vertices in the userVertices structure
@@ -1201 +1207 @@
             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()
 

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -23 +23 @@
 DEFAULT_ATTRIBUTE = 'elevation'
 
+#for alpha shapes
 NO_SELECTION = 0
 AUTO = 1
 SET_ALPHA = 2
+
 
 class Draw(AppShell.AppShell):
@@ -623 +625 @@
     def autoSegmentGiveAlphaButton (self, parent):
         dialog = AutoSegmentDialog(self.canvas, self.meshLastAlpha)
-        if dialog.var.get() == SET_ALPHA:
+        if dialog.use_optimum.get() == SET_ALPHA:
             if dialog.alphaValueOk:
-                self.autoSegment(alpha = dialog.alpha)
+                self.autoSegment(alpha = dialog.alpha,
+                                 boundary_type=dialog.boundary_type.get())
             else:
                  showerror('pMesh',
@@ -631 +634 @@
         else:
             self.autoSegment()
-            
-        
-    def autoSegment (self, alpha = None):
+           
+        
+    def autoSegment (self, alpha = None, boundary_type=mesh.REMOVE_PINCH_OFF):
         """
         add Segments to bound all vertices
@@ -1449 +1452 @@
         self.title("Automatically Add Segments")
 
-        self.var = IntVar()
-        self.var.set(AUTO) # should initialise the radio buttons. It doesn't
-        #self.var.set(NO_SELECTION) 
-        self.ck = Radiobutton(master, value = AUTO, variable=self.var) 
+        self.use_optimum = IntVar()
+        self.use_optimum.set(AUTO) # should initialise the radio buttons.
+                                   #  It doesn't
+        self.boundary_type = IntVar()
+                                   
+        #self.use_optimum.set(NO_SELECTION) 
+        self.ck = Radiobutton(master, value = AUTO, variable=self.use_optimum) 
         self.ck.grid(row=1, column=0)
         Label(master, text='Use optimum alpha').grid(row=1, column=1, sticky=W)
 
-        self.ck2 = Radiobutton(master, value = SET_ALPHA, variable=self.var) 
+        self.ck2 = Radiobutton(master, value = SET_ALPHA,
+                               variable=self.use_optimum) 
         self.ck2.grid(row=2, column=0)
         
@@ -1471 +1478 @@
         self.alpha_str.grid(row=2, column=3, sticky=W)
 
+        #boundary type buttons
+        self.ck3 = Radiobutton(master, value = mesh.RAW,
+                               variable=self.boundary_type) 
+        self.ck3.grid(row=3, column=0)
+        Label(master, text='Raw boundary').grid(row=3, column=1, sticky=W)
+        #
+        self.ck4 = Radiobutton(master, value = mesh.REMOVE_HOLES,
+                               variable=self.boundary_type) 
+        self.ck4.grid(row=4, column=0)
+        Label(master, text='Remove small holes').grid(row=4,column=1, sticky=W)
+        #
+        self.ck5 = Radiobutton(master, value = mesh.REMOVE_SHARP_INDENTS,
+                               variable=self.boundary_type) 
+        self.ck5.grid(row=5, column=0)
+        Label(master,
+              text='Remove small holes \n& sharp indents').grid(row=5,
+                                                              column=1,
+                                                              sticky=W)
+        #
+        self.ck6 = Radiobutton(master, value = mesh.REMOVE_PINCH_OFF,
+                               variable=self.boundary_type) 
+        self.ck6.grid(row=6, column=0)
+        Label(master,
+              text='Remove small holes & \nsharp indents & pinch off').grid( \
+                                                              row=6,
+                                                              column=1,
+                                                              sticky=W)
+
+        
         self.alpha  = 0
         self.alphaValueOk = False