Changeset 1395

Timestamp:

May 16, 2005, 11:22:40 AM (20 years ago)

Author:

duncan

Message:

load_mesh refactoring

Location:

inundation/ga/storm_surge/pmesh

Files:

• mesh.py (modified) (5 diffs)
• pmesh.py (modified) (2 diffs)
• test_mesh.py (modified) (1 diff)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -1731 +1731 @@
                             self.regions)
         
-        # exportASCIImeshfile   
+        # exportASCIImeshfile   - this function is used
     def export_mesh_file(self,ofile):
         """
@@ -1773 +1773 @@
             raise RuntimeError
         numVertAttrib = str(len(Vertices[0].attributes))
-        title = numVert + " " + numVertAttrib + " # <vertex #> <x> <y> [attributes]"
+        #title = numVert + " " + numVertAttrib + " # <vertex #> <x> <y> [attributes]"
 
         #Convert the Vertices to pointlist and pointattributelist
@@ -1788 +1788 @@
         xya_dict['geo_reference'] = self.geo_reference
 
-        load_mesh.loadASCII.export_xya_file(ofile, xya_dict, title, delimiter = " ")
+        load_mesh.loadASCII.export_points_file(ofile, xya_dict)
 
         
@@ -2732 +2732 @@
 def importMeshFromFile(ofile):
     """returns a mesh object, made from a .xya/.pts or .tsh/.msh file
-    Often raises SyntaxError, IOError
+    Often raises IOError,RuntimeError
     """
     newmesh = None
-    if ofile[-4:]== ".xya":
-        #print "loading " + ofile
-        try:
-            dict = load_mesh.loadASCII.load_points_file(ofile, delimiter = ',')
-        except SyntaxError:
-            dict = load_mesh.loadASCII.load_points_file(ofile, delimiter = ' ')
-        #print "dict",dict   outline_     
-        dict['segmentlist'] = []
-        dict['segmenttaglist'] = []
-        dict['regionlist'] = []
-        dict['regionattributelist'] = []
-        dict['regionmaxarealist'] = []
-        dict['holelist'] = []
-        newmesh= Mesh()
-        newmesh.setMesh(dict) #FIXME use IOOutline2Mesh
-        counter = newmesh.removeDuplicatedUserVertices()
-        if (counter >0):
-            print "%i duplicate vertices removed from dataset" % (counter)
-    elif ofile[-4:]== ".pts":
-        #print "loading " + ofile
-        dict = load_mesh.loadASCII.load_points_file(ofile)
-        #print "dict",dict
+    if (ofile[-4:]== ".xya" or ofile[-4:]== ".pts"):
+        dict = load_mesh.loadASCII.import_points_file(ofile)
         dict['points'] = dict['pointlist']
         dict['outline_segments'] = []
@@ -2765 +2745 @@
         dict['holes'] = [] 
         newmesh= Mesh(geo_reference = dict['geo_reference'])
-        newmesh.IOOutline2Mesh(dict) #FIXME use IOOutline2Mesh
+        newmesh.IOOutline2Mesh(dict)
         counter = newmesh.removeDuplicatedUserVertices()
         if (counter >0):
-            print "%i duplicate vertices removed from dataset" % (counter)  
+            print "%i duplicate vertices removed from dataset" % (counter)
     elif (ofile[-4:]== ".tsh" or ofile[-4:]== ".msh"):
-        dict = load_mesh.loadASCII.import_triangulation(ofile)
+        dict = load_mesh.loadASCII.import_mesh_file(ofile)
         #print "********"
         #print "zq mesh.dict",dict

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -1373 +1373 @@
             self.ResizeToFit()
        
-        except SyntaxError: 
-            #this is assuming that the SyntaxError is thrown in
-            #loadxyafile
-            showerror('File error',
-                      ofile + ' is not in the correct format.')
         except IOError: 
             #!!! this error type can not be thrown?
             showerror('File error',
-                      'file ' + ofile + ' could not be found.')
+                      'file ' + ofile + ' could not be loaded.')
 
         except RuntimeError: 
@@ -1450 +1445 @@
            
         if ofile:
+            # .tsh is the default file format
             if (ofile[-4:] == ".tsh" or ofile[-4:] == ".msh"):  
                 self.currentFilePathName = ofile

inundation/ga/storm_surge/pmesh/test_mesh.py

@@ -894 +894 @@
                  holes = [h1])
         
-        fileName = tempfile.mktemp(".txt")
+        fileName = tempfile.mktemp(".xya")
         m.exportxyafile(fileName)
         file = open(fileName)