Changeset 3437 for inundation/pmesh

Timestamp:

Aug 2, 2006, 2:14:46 PM (19 years ago)

Author:

duncan

Message:

method name change - auto_segment

Location:

inundation/pmesh

Files:

• graphical_mesh_generator.py (modified) (10 diffs)
• mesh.py (modified) (4 diffs)
• test_mesh.py (modified) (5 diffs)
• timing.py (modified) (1 diff)

inundation/pmesh/graphical_mesh_generator.py

@@ -130 +130 @@
                                  'add Segments to form alpha shape'  ,
                                  label='Auto segment',
-                                 command=self.autoSegment)
+                                 command=self.auto_segment)
         self.menuBar.addmenuitem('File', 'command',
                            'modify the alpha boundary by applying filters',
                                  label='filter alpha boundary',
-                                 command=self.autoSegmentFilter)
+                                 command=self.auto_segmentFilter)
         self.menuBar.addmenuitem('File', 'command', 'Normalise mesh',
                                  label='Normalise mesh', command=self.normaliseMesh)
@@ -206 +206 @@
                 ('default', self.windowDefault, 'set default value for selected mode'),
                 ('joinVer', self.joinVerticesButton, 'add Segments to connect all vertices'),      
-             #   ('autoSegHull', self.autoSegmentHullButton, 'add Segments to form alpha shape, using Hull'),  
-             #   ('autoSeg', self.autoSegmentButton, 'add Segments to form alpha shape'), 
-                ('autoSegGiveAlpha', self.autoSegmentGiveAlphaButton, 'add Segments to form alpha shape, specify alpha'),
+             #   ('autoSegHull', self.auto_segmentHullButton, 'add Segments to form alpha shape, using Hull'),  
+             #   ('autoSeg', self.auto_segmentButton, 'add Segments to form alpha shape'), 
+                ('autoSegGiveAlpha', self.auto_segmentGiveAlphaButton, 'add Segments to form alpha shape, specify alpha'),
                 ('meshGen', self.windowMeshGen, 'Generate Mesh')]:
             ToolBarButton(self, self.toolbar, key, '%s.gif' % key,
@@ -669 +669 @@
                                      self.UserMeshChanged)
     
-    def autoSegmentButton (self, parent):
-        self.autoSegment()
-
-        
-    def autoSegmentGiveAlphaButton (self, parent):
-        dialog = AutoSegmentDialog(self.canvas, self.meshLastAlpha)
+    def auto_segmentButton (self, parent):
+        self.auto_segment()
+
+        
+    def auto_segmentGiveAlphaButton (self, parent):
+        dialog = auto_segmentDialog(self.canvas, self.meshLastAlpha)
         if dialog.use_optimum.get() == SET_ALPHA:
             if dialog.alphaValueOk:
-                self.autoSegment(alpha = dialog.alpha,
+                self.auto_segment(alpha = dialog.alpha,
                                  raw_boundary=dialog.raw_boundary.get(),
                                  remove_holes=dialog.remove_holes.get(),
@@ -686 +686 @@
                       'Bad alpha value.')
         else:
-            self.autoSegment(raw_boundary=dialog.raw_boundary.get(),
+            self.auto_segment(raw_boundary=dialog.raw_boundary.get(),
                              remove_holes=dialog.remove_holes.get(),
                              smooth_indents=dialog.smooth_indents.get(),
@@ -692 +692 @@
            
         
-    def autoSegment (self, alpha = None,
+    def auto_segment (self, alpha = None,
                                  raw_boundary=True,
                                  remove_holes=False,
@@ -704 +704 @@
             try:
                 newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = \
-                     self.mesh.autoSegment(alpha=alpha,
+                     self.mesh.auto_segment(alpha=alpha,
                                            remove_holes=remove_holes,
                                            smooth_indents=smooth_indents,
@@ -710 +710 @@
             except AlphaError:
                 showerror('pMesh',
-                          'Unable to autosegment.')
+                          'Unable to auto_segment.')
             else:
 
@@ -726 +726 @@
         else:
             showerror('pMesh',
-                      'Three or more vetices are needed to be able to autosegment.')
-
-
-    def autoSegmentFilter (self):
-        dialog = AutoSegmentFilterDialog(self.canvas)
+                      'Three or more vetices are needed to be able to auto_segment.')
+
+
+    def auto_segmentFilter (self):
+        dialog = auto_segmentFilterDialog(self.canvas)
         newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = \
-                 self.mesh.autoSegmentFilter(raw_boundary=dialog.raw_boundary.get(),
+                 self.mesh.auto_segmentFilter(raw_boundary=dialog.raw_boundary.get(),
                              remove_holes=dialog.remove_holes.get(),
                              smooth_indents=dialog.smooth_indents.get(),
@@ -1499 +1499 @@
         
 
-class  AutoSegmentDialog(Dialog):
+class  auto_segmentDialog(Dialog):
     """
     Dialog box for adding segments
@@ -1584 +1584 @@
 
 
-class  AutoSegmentFilterDialog(Dialog):
+class  auto_segmentFilterDialog(Dialog):
     """
     Dialog box for adding segments

inundation/pmesh/mesh.py

@@ -1504 +1504 @@
             self.regions.append(Object)
             
-    def TestautoSegment(self):
+    def Testauto_segment(self):
         newsegs = []
         s1 = Segment(self.userVertices[0],
@@ -1528 +1528 @@
         fd.close()
 
-    def autoSegmentHull(self):
+    def auto_segmentHull(self):
         """
         initially work by running an executable
@@ -1575 +1575 @@
         self.userSegments.extend(newsegs)
         return newsegs
-    def autoSegmentFilter(self,raw_boundary=True,
+    def auto_segmentFilter(self,raw_boundary=True,
                     remove_holes=False,
                     smooth_indents=False,
@@ -1591 +1591 @@
         
     
-    def autoSegment(self, alpha = None,
+    def auto_segment(self, alpha = None,
                     raw_boundary=True,
                     remove_holes=False,

inundation/pmesh/test_mesh.py

@@ -317 +317 @@
                         'Segment should not be new. ')
         
-    def testautoSegment(self):
+    def testauto_segment(self):
         p0 = Vertex (0.0, 0.0)
         p1 = Vertex (0.0, 4.0)
@@ -326 +326 @@
         
         m = Mesh(userVertices=[p0, p1, p2, p3], userSegments=[s1] ) 
-        m.autoSegment()
+        m.auto_segment()
         
         #print 'Len', len(m.userSegments)
@@ -332 +332 @@
                         'userSegments is wrong!')
      
-        m.autoSegment()
+        m.auto_segment()
         self.failUnless(len(m.getUserSegments()) == 4 ,
                         'userSegments is wrong!')
      
-    def testautoSegmentII(self):
+    def testauto_segmentII(self):
         p1 = Vertex (3.0, 4.0)
         p2 = Vertex (3.0,2.0)
@@ -351 +351 @@
                  userSegments=[s1, s2])     
 
-        m.autoSegment()
+        m.auto_segment()
         
         s3 = m.representedAlphaUserSegment(p3,p0)
@@ -362 +362 @@
                         'userSegments is wrong!')
         
-        # remove a segment, add a point, autosegment
+        # remove a segment, add a point, auto_segment
         m.alphaUserSegments.remove(s3)
         p6 = Vertex (1.0, 2.0)
         m.userVertices.append(p6)
         
-        m.autoSegment()
+        m.auto_segment()
         
         s1_now = m.representedUserSegment(p3,p2)

inundation/pmesh/timing.py

@@ -39 +39 @@
 times.append(("user_outline_created",time.time() - tinitial ))
 #------------------------------------------
-#mesh.autoSegment()
-#times.append(("mesh_autosegmented",time.time() - tinitial ))
+#mesh.auto_segment()
+#times.append(("mesh_auto_segmented",time.time() - tinitial ))
 #------------------------------------------
 mesh.generateMesh(mode = "Q",maxArea = 1)