Changeset 702

Timestamp:

Dec 14, 2004, 8:48:23 AM (20 years ago)

Author:

duncan

Message:

Added selection of different alpha values when generating segments automatically

Location:

inundation/ga/storm_surge/pmesh

Files:

• documentation/issues.txt (modified) (1 diff)
• mesh.py (modified) (20 diffs)
• meshHarness.py (modified) (2 diffs)
• pmesh.py (modified) (12 diffs)

inundation/ga/storm_surge/pmesh/documentation/issues.txt

@@ -2 +2 @@
 
 OPEN - issues that have not beeen resolved
+Issue:  Ole thought that the regional mesh max areas were incorrect
+when a .tsh file was loaded.  Maybe it was that the overall max area
+is not saved.  It's hard coded in MeshGenDialog.
+Importance: Medium
+Suggested Action: Fix when .tsh goes NETCDF
+
 Issue: Catch error if .tsh file is a bad format.
 suggestion: auick and dirty try - except

inundation/ga/storm_surge/pmesh/mesh.py

@@ -13 +13 @@
    Geoscience Australia
 """
-
 import load_mesh.loadASCII
 import alpha_shape.alpha_shape
@@ -386 +385 @@
                                 self.meshSegments,
                                 self.meshVertices,
-                                self.userSegments,
+                                self.getUserSegments(),
                                 self.userVertices,
                                 self.holes,
@@ -400 +399 @@
         else:
             self.userSegments=userSegments
+        self.alphaUserSegments=[]
             
         if userVertices is None:
@@ -535 +535 @@
     
     def getUserSegments(self):
-        return self.userSegments
-    
+        allSegments = self.userSegments + self.alphaUserSegments
+        #print "self.userSegments",self.userSegments
+        #print "self.alphaUserSegments",self.alphaUserSegments
+        #print "allSegments",allSegments
+        return allSegments
+    
+    def deleteUserSegments(self,seg):
+        if self.userSegments.count(seg) == 0:
+            self.alphaUserSegments.remove(seg)
+            pass
+        else:
+            self.userSegments.remove(seg)
+            
+    def clearUserSegments(self):
+        self.userSegments = []
+        self.alphaUserSegments = []
+                
     def getTriangulation(self):
         return self.meshTriangles
@@ -579 +594 @@
         This function will keep the first duplicate
         """
-        assert self.userSegments == []
+        assert self.getUserSegments() == []
         self.userVertices, counter =  self.removeDuplicatedVertices(self.userVertices)
         return counter
@@ -625 +640 @@
         This function will keep the first duplicate
         """
-        assert self.userSegments == []
+        assert self.getUserSegments() == []
         #t = self.userVertices
         #self.userVertices =[]
@@ -652 +667 @@
             
     def isUserSegmentNew(self, v1,v2):
+        identicalSegs= [x for x in self.getUserSegments() if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
+        
+        return len(identicalSegs) == 0
+
+    def representedAlphaUserSegment(self, v1,v2):
+        identicalSegs= [x for x in self.alphaUserSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
+
+        if identicalSegs == []:
+            return None
+        else:
+            # Only return the first one.
+            return identicalSegs[0]
+    
+    def representedUserSegment(self, v1,v2):
         identicalSegs= [x for x in self.userSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
-        
-        return len(identicalSegs) == 0
-
+
+        if identicalSegs == []:
+            return None
+        else:
+            # Only return the first one.
+            return identicalSegs[0]
+        
     def deleteSegsOfVertex(self, delVertex):
         """
@@ -662 +695 @@
         #Find segments that connect to delVertex
         deletedSegments = []
-        for seg in self.userSegments:
+        for seg in self.getUserSegments():
             if (delVertex in seg.vertices):
                 deletedSegments.append(seg)
         # Delete segments that connect to delVertex
         for seg in deletedSegments:
-            self.userSegments.remove(seg)
-        # Delete delVertex
-        # self.userVertices.remove(delVertex)
+            self.deleteUserSegments(seg)
         return deletedSegments
 
@@ -684 +715 @@
         elif isinstance(MeshObject, Segment):
             deletedObs.append(MeshObject)
-            self.userSegments.remove(MeshObject)
+            self.deleteUserSegments(MeshObject)
         elif isinstance(MeshObject, Hole):
             deletedObs.append(MeshObject)
@@ -721 +752 @@
         segmentlist=[]
         segmentmarkerlist=[]
-        for seg in self.userSegments:
+        for seg in self.getUserSegments():
             segmentlist.append((seg.vertices[0].index,seg.vertices[1].index))
             segmentmarkerlist.append(seg.marker)
         meshDict['segmentlist'] =segmentlist 
-        meshDict['segmentmarkerlist'] =segmentmarkerlist 
-
+        meshDict['segmentmarkerlist'] =segmentmarkerlist
         holelist=[]
         for hole in self.holes:
@@ -913 +943 @@
 
         #Clear the current user mesh values
-        self.userSegments=[]
+        self.clearUserSegments()
         self.userVertices=[]
         self.Holes=[]
@@ -991 +1021 @@
             #index +=1
             self.userSegments.append(segObject)
-        
+            #DSG!!!
+            
     def TestautoSegment(self):
         newsegs = []
@@ -1006 +1037 @@
         if self.isUserSegmentNew(s3.vertices[0],s3.vertices[1]):
             newsegs.append(s3)
+        #DSG!!!
         self.userSegments.extend(newsegs)
         return newsegs
@@ -1059 +1091 @@
                 newseg = Segment(v1, v2)
                 newsegs.append(newseg)
+            #DSG!!!
         self.userSegments.extend(newsegs)
         return newsegs
      
-    def autoSegment(self):
-        """
-
+    def autoSegment(self, alpha = None):
+        """
         Precon: There must be 3 or more vertices in the userVertices structure
         """
-
         
         points=[]
         for vertex in self.getUserVertices():
             points.append((vertex.x,vertex.y))
-            
-        shape = alpha_shape.alpha_shape.Alpha_Shape(points)
+        shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
         boundary_segs = shape.get_boundary()
 
-        newsegs = []
+        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 = []
+        alpha_segs = []
+        user_segs = []
         for seg in boundary_segs:
             v1 = self.userVertices[int(seg[0])]
             v2 = self.userVertices[int(seg[1])]
-            if self.isUserSegmentNew(v1, v2):
+            alpha_seg = self.representedAlphaUserSegment(v1, v2)
+            user_seg = self.representedUserSegment(v1, v2)
+            #DSG!!!
+            assert not(not (alpha_seg == None) and not (user_seg == None))
+            if not alpha_seg == None:
+                alpha_segs.append(alpha_seg)
+            elif not user_seg  == None:
+                user_segs.append(user_seg)
+            else:
                 unique_seg = Segment(v1, v2)
-                newsegs.append(unique_seg)
-        self.userSegments.extend(newsegs)
-        return newsegs
+                new_segs.append(unique_seg)
+
+            for seg in alpha_segs:
+                try:
+                    segs2delete.remove(seg)
+                except:
+                    pass
+        
+        self.alphaUserSegments = []
+        self.alphaUserSegments.extend(new_segs)
+        self.alphaUserSegments.extend(alpha_segs)
+
+        optimum_alpha = shape.get_alpha()
+        # need to draw newsegs
+        return new_segs, segs2delete, optimum_alpha
      
     def joinVertices(self):
@@ -1111 +1179 @@
 
         #Update list of user segments        
+        #DSG!!!
         self.userSegments.extend(newsegs)                
         return newsegs
@@ -1305 +1374 @@
             text.pack()
            
-            for segment in self.userSegments:
+            for segment in self.getUserSegments():
                 segment.draw(canvas,SCALE, xoffset, yoffset )
                 
@@ -1335 +1404 @@
         self.writeASCIImesh(fd,
                             self.userVertices,
-                            self.userSegments,
+                            self.getUserSegments(),
                             self.holes,
                             self.regions)    
@@ -1359 +1428 @@
         self.writeASCIIsegmentoutline(fd,
                             self.userVertices,
-                            self.userSegments,
+                            self.getUserSegments(),
                             self.holes,
                             self.regions)    
@@ -1414 +1483 @@
         self.writeASCIImesh(fd,
                             verts,
-                            self.userSegments,
+                            self.getUserSegments(),
                             self.holes,
                             self.regions)    
@@ -1431 +1500 @@
         self.writeASCIImesh(fd,
                             self.userVertices,
-                            self.userSegments,
+                            self.getUserSegments(),
                             self.holes,
                             self.regions)        

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -219 +219 @@
                         'Segment should not be new. ')
 
+
+    def testisUserSegmentNew (self):
+        mesh = Mesh()
+        a = mesh.addUserVertex(0.0, 0.0)
+        b = mesh.addUserVertex (0.0, 2.0)
+        c = mesh.addUserVertex (2.0,0.0)
+        d = mesh.addUserVertex (2.0,3.0)
+        
+        s1 = mesh.addUserSegment(a,b)
+        s2 = mesh.addUserSegment(a,c)
+        s3 = mesh.addUserSegment(c,b)
+
+        self.failUnless(mesh.representedUserSegment(a,d) == None,
+                        'Segment should be new. ')
+        self.failUnless(mesh.representedUserSegment(a,b) == s1 ,
+                        'Segment should not be new. ')
         
     def testautoSegment(self):
-        a = Vertex (0.0, 0.0)
-        d = Vertex (0.0, 4.0)
-        f = Vertex (4.0,4.0)
-        g = Vertex (4.0,0.0)
-
-        s1 = Segment(a,d)
-        #s2 = Segment(a,f)
-        #s3 = Segment(f,d)
-        
-        m = Mesh(userVertices=[a,d,f,g], userSegments=[s1] )     
-
+        p0 = Vertex (0.0, 0.0)
+        p1 = Vertex (0.0, 4.0)
+        p2 = Vertex (4.0,4.0)
+        p3 = Vertex (4.0,0.0)
+
+        s1 = Segment(p0,p1)
+        
+        m = Mesh(userVertices=[p0, p1, p2, p3], userSegments=[s1] ) 
+        m.autoSegment()
+        
+        #print 'Len', len(m.userSegments)
+        self.failUnless(len(m.getUserSegments()) == 4 ,
+                        'userSegments is wrong!')
+     
+        m.autoSegment()
+        self.failUnless(len(m.getUserSegments()) == 4 ,
+                        'userSegments is wrong!')
+     
+    def testautoSegmentII(self):
+        p1 = Vertex (3.0, 4.0)
+        p2 = Vertex (3.0,2.0)
+        p3 = Vertex (3.0,0.0)
+        p4 = Vertex (6.0, 4.0)
+        p5 = Vertex (6.0,2.0)
+        p0 = Vertex (6.0,0.0)
+
+
+        s1 = Segment(p2,p3)
+        s2 = Segment(p4,p5)
+        
+        m = Mesh(userVertices=[p0, p1, p2, p3, p4, p5],
+                 userSegments=[s1, s2])     
+
+        m.autoSegment()
+        
+        s3 = m.representedAlphaUserSegment(p3,p0)
+        self.failUnless(not (s3 == None) ,
+                        'userSegments is wrong!')
+
+        
+        s6 = m.representedAlphaUserSegment(p1,p4)       
+        self.failUnless(not (s6 == None) ,
+                        'userSegments is wrong!')
+        
+        # remove a segment, add a point, autosegment
+        m.alphaUserSegments.remove(s3)
+        p6 = Vertex (1.0, 2.0)
+        m.userVertices.append(p6)
+        m.autoSegment()
+        
+        s1_now = m.representedUserSegment(p3,p2)
+        self.failUnless(s1_now == s1 ,
+                        'userSegments is wrong!')
+        
+        s2_now = m.representedUserSegment(p5,p4)       
+        self.failUnless(s2_now == s2 ,
+                        'userSegments is wrong!')
+        
+        s3 = m.representedAlphaUserSegment(p3,p6)       
+        self.failUnless(not (s3 == None) ,
+                        'userSegments is wrong!')
+        
+        s4 = m.representedAlphaUserSegment(p3,p6)       
+        self.failUnless(not (s4 == None) ,
+                        'userSegments is wrong!')
+        
+        s5 = m.representedAlphaUserSegment(p4,p6)       
+        self.failUnless(s5 == None ,
+                        'userSegments is wrong!')
+        
+        s6_now = m.representedAlphaUserSegment(p1,p4)
+        self.failUnless(s6_now == s6 ,
+                        'userSegments is wrong!')
+        
+            
+        
         #print m
         
-        m.autoSegment()
-        
-        #print m
-
-        #print 'Len', len(m.userSegments)
-
-        self.failUnless(len(m.userSegments) == 4 ,
-                        'userSegments is wrong!')
-     
     def testRegions(self):
         a = Vertex (0.0, 0.0)
@@ -939 +1011 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(meshTestCase,'test')
-    runner = unittest.TextTestRunner()
+    suite = unittest.makeSuite(meshTestCase,'test') 
+    #suite = unittest.makeSuite(meshTestCase,'testautoSegment')
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)
     

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -4 +4 @@
 from   tkSimpleDialog import Dialog
 import mesh
-from Tkinter import  FALSE,TRUE, Frame,X, LEFT,YES,BOTH,ALL,Widget,CURRENT, Label,W, Entry, E, StringVar, END
+from Tkinter import  FALSE,TRUE, Frame,X, LEFT,YES,BOTH,ALL,Widget,CURRENT, Label,W, Entry, E, StringVar, END, Checkbutton, Radiobutton, IntVar
 #from cursornames import TLC,TRC, BLC, BRC, TS, RS, LS, BS
 from tkMessageBox import showerror, _show, QUESTION,YESNOCANCEL
@@ -17 +17 @@
 TRIANGLE_COLOUR = 'green'
 APPLICATION_NAME = 'Pmesh'
+
+NO_SELECTION = 0
+AUTO = 1
+SET_ALPHA = 2
 
 class Draw(AppShell.AppShell):
@@ -187 +191 @@
                 ('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'),
+             #   ('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'),
                 ('meshGen', self.windowMeshGen, 'Generate Mesh')]:
             ToolBarButton(self, self.toolbar, key, '%s.gif' % key,
@@ -366 +371 @@
     def autoSegmentButton (self, parent):
         self.autoSegment()
-        
-    def autoSegment (self):
+
+        
+    def autoSegmentGiveAlphaButton (self, parent):
+        dialog = AutoSegmentDialog(self.canvas, self.meshLastAlpha)
+        if dialog.var.get() == SET_ALPHA:
+            if dialog.alphaValueOk:
+                self.autoSegment(alpha = dialog.alpha)
+            else:
+                 showerror('pMesh',
+                      'Bad alpha value.')
+        else:
+            self.autoSegment()
+            
+        
+    def autoSegment (self, alpha = None):
         """
         add Segments to bound all vertices
@@ -376 +394 @@
         """
         if len(self.mesh.getUserVertices()) >= 3:
-            newsegs = self.mesh.autoSegment()
+            if alpha == None:
+                newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = self.mesh.autoSegment()
+            else:
+                newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = self.mesh.autoSegment(alpha)
+                
+            #print "newsegs",newsegs
+            #print "ObjectsToVisuallyDelete",ObjectsToVisuallyDelete
+            
+            for drawOb in ObjectsToVisuallyDelete:
+                    self.UserMesh.unvisualise(drawOb, self.canvas)
+                
             for segment in newsegs:
                 self.serial +=1
@@ -384 +412 @@
                                         self.canvas,
                                         self.SCALE)
+            
         else:
             showerror('pMesh',
@@ -1034 +1063 @@
         mesh.Segment.set_default_tag("")
         self.UserMeshChanged = False
+        self.meshLastAlpha = None
     
     def ipostscript(self):
@@ -1109 +1139 @@
         self.xstr.grid(row=0, column=1, sticky=W)
         self.ystr.grid(row=1, column=1, sticky=W)
-
+        self.xstr.focus_force()
         self.x  = 0
         self.y  = 0
@@ -1115 +1145 @@
         
 
+class  AutoSegmentDialog(Dialog):
+    """
+    Dialog box for adding segments
+    """
+    def __init__(self, parent, alpha):
+        self.alpha = alpha
+        Dialog.__init__(self, parent)
+        
+    def body(self, master):
+        """
+        GUI description
+        """
+        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.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.grid(row=2, column=0)
+        
+        Label(master, text='alpha:').grid(row=2, column=1, sticky=W)
+        if (self.alpha):
+            alphaVar = StringVar()
+            alphaVar.set(self.alpha)
+            self.alpha_str  = Entry(master,
+                                     textvariable = alphaVar,
+                                     width = 16, name ="entry") 
+        else: 
+            self.alpha_str = Entry(master, width = 16, name ="entry")
+        
+        self.alpha_str.grid(row=2, column=3, sticky=W)
+
+        self.alpha  = 0
+        self.alphaValueOk = False
+        
+
     def apply(self):
         """
@@ -1120 +1190 @@
         """
         try:
-            self.x = float(self.xstr.get())
-            self.y = float(self.ystr.get())
-            self.xyValuesOk = True
+            self.alpha = float(self.alpha_str.get())
+            self.alphaValueOk = True
             
         except ValueError:
-            showerror('Bad Vertex values',
-                                   'X Y values are not numbers.')
+            pass
+            #showerror('Bad Alpha value',
+            #                       'Alpha is negative.')
 
 
@@ -1140 +1210 @@
 
     def __init__(self,
-                 parent,
+                 paent,
                  minAngle,
                  maxArea,
@@ -1184 +1254 @@
             self.maxAreastr  = Entry(master,
                                      width = 16)
+            self.maxAreastr.focus_force()
             numTrianglesVar = StringVar()
             numTrianglesVar.set(self.numTriangles)