Changeset 407

Timestamp:

Oct 15, 2004, 12:14:48 PM (19 years ago)

Author:

duncan

Message:

removed default region tag bug

Location:

inundation/ga/storm_surge/pmesh

Files:

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

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

@@ -22 +22 @@
 Using a 100 * 100 domain, a max triangle area of 0.01 produced
 1,048,576 triangles.
-
-Issue: The default region button cannot be selected after loading a file.
-Reason: Unknown.  
-Importance: Low
 
 Issue: The mesh produced by triangle isn't of high quality near a low
@@ -117 +113 @@
 CLOSED - issues that have  beeen resolved
 ************
+
+Issue: The default region button cannot be selected after loading a file.
+Reason: Unknown.  
+Importance: Low
+
 Issue: The vertices were being sorted when loading .xya files
 Time to complete : 5hrs

inundation/ga/storm_surge/pmesh/mesh.py

@@ -962 +962 @@
         #segment marker list: [S1Marker, S2Marker, ...] (list of ints)
         """
-
-        print "@#@#@#"
-        print outlineDict
-        print "@#@#@#"
 
         localUserVertices = []

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -840 +840 @@
 
 
-    def test_removeDuplicatedVertices(self):
+    def test_ungenerateFileLoading(self):
         
         fileName = tempfile.mktemp(".txt")
@@ -873 +873 @@
         m = Mesh(userVertices=[a,b,c,d], userSegments=[s1,s2,s3,s4])
         dict = importUngenerateFile(fileName)
+
+        tag = "DSG"
+        Segment.set_default_tag(tag)
         m.addVertsSegs(dict)
+
+        # have to reset this , since it's a class attribute
+        Segment.set_default_tag("")
             
         self.failUnless(len(m.userSegments) ==11,
-                        'Segments not deleted.')
+                        'Wrong segment list length.')
         self.failUnless(len(m.userVertices) == 11,
-                        'Vertex deleted, instead of segment.')
+                        'Wrong vertex list length.')
         self.failUnless(m.userSegments[10].vertices[0] == m.userVertices[10],
-                        'Vertex deleted, instead of segment.')
+                        'bad vertex on segment.')
         self.failUnless(m.userSegments[10].vertices[1] == m.userVertices[8],
-                        'Vertex deleted, instead of segment.')
+                        'Bad segment.')
+        self.failUnless(m.userSegments[10].marker == tag,
+                        'wrong tag.')
         
 #-------------------------------------------------------------

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -5 +5 @@
 import mesh
 from Tkinter import  FALSE,TRUE, Frame,X, LEFT,YES,BOTH,ALL,Widget,CURRENT, Label,W, Entry, E, StringVar, END
-from cursornames import TLC,TRC, BLC, BRC, TS, RS, LS, BS
+#from cursornames import TLC,TRC, BLC, BRC, TS, RS, LS, BS
 from tkMessageBox import showerror, _show, QUESTION,YESNOCANCEL
 import types
@@ -154 +154 @@
                                statushelp='')
             t.cycle("DrawMode")
-            if key == 'pointer': #FIXME - this is specified in line 925 as well
+            if key == 'pointer': #FIXME- this is specified in line 1062 as well
+                                 # self.selectFunc('pointer')
                 self.curFunc  = self.drawVertex
                 t.setInitialSunkenButton("DrawMode")
@@ -885 +886 @@
             self.currentFilePathName = ofile
             self.clearMesh()
-            self.initData()
             self.mesh = newmesh
             self.visualiseMesh(self.mesh)
@@ -1001 +1001 @@
         Initialise various lists and flags
         """
-        self.curModeClass=  None  #mesh.Vertex?
         self.serial      = 1000
         self.currentFilePathName = 'untitled'

inundation/ga/storm_surge/pmesh/visualmesh.py

@@ -68 +68 @@
         return VMesh([self,other])
 
+    def __repr__(self):
+        return str(self.__class__)
     
 class vPoints(vAbstract):