Changeset 1035

Timestamp:

Mar 8, 2005, 12:15:59 PM (20 years ago)

Author:

duncan

Message:

all meshes now have geo-refs.
added some assertions

File:

• inundation/ga/storm_surge/pmesh/mesh.py (modified) (8 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -27 +27 @@
 
 import load_mesh
+from coordinate_transforms.geo_reference import Geo_reference
 
 SET_COLOUR='red'
-
+DEFAULT_ZONE = 56
     
 def gradient_python(x0, y0, x1, y1, x2, y2, q0, q1, q2):
@@ -127 +128 @@
     def __init__(self,X,Y, attributes = None):
         __slots__ = ['x','y','attributes']
+        assert (type(X) == types.FloatType)
         self.x=X
         self.y=Y        
@@ -394 +396 @@
         """
         Each segment is specified by listing the vertices of its endpoints
-        """
-
+        The vertices are Vertex objects
+        """
         assert(vertex1 != vertex2)
         self.vertices = [vertex1,vertex2 ]
@@ -414 +416 @@
             #end.draw(canvas,scale, xoffset, yoffset ) # draw the vertices
             x.append(scale*(end.x + xoffset))
-            y.append(-1*scale*(end.y + yoffset))  # - since for a canvas - is up 
-        return canvas.create_line(x[0], y[0], x[1], y[1], tags = tags,fill=colour)
+            y.append(-1*scale*(end.y + yoffset)) # - since for a canvas - is up
+        
+        return canvas.create_line(x[0], y[0], x[1], y[1],
+                                  tags = tags,fill=colour)
     def set_tag(self,tag):
         self.tag = tag
@@ -498 +502 @@
 
         if geo_reference is None:
-            self.geo_reference = None
+            self.geo_reference = Geo_reference(DEFAULT_ZONE,0,0) 
         else:
             self.geo_reference = geo_reference
@@ -1119 +1123 @@
         segment list: [(point1,point2),(p3,p4),...] (Tuples of integers)
         #segment tag list: [S1Tag, S2Tag, ...] (list of ints)
+
+        Assume the values are in Eastings and Northings, with no reference
+        point
         """
 
@@ -1124 +1131 @@
         #index = 0
         for point in outlineDict['pointlist']:
-            v=Vertex(point[0], point[1])
+            
+            v=Vertex(point[0]-self.geo_reference.xllcorner,
+                     point[1]-self.geo_reference.yllcorner)
             #v.index = index
             #index +=1
@@ -2278 +2287 @@
     elif (ofile[-4:]== ".tsh" or ofile[-4:]== ".msh"):
         dict = load_mesh.loadASCII.import_triangulation(ofile)
-        print "********"
-        print "zq mesh.dict",dict
-        print "********" 
+        #print "********"
+        #print "zq mesh.dict",dict
+        #print "********" 
         newmesh= Mesh()
         newmesh.IOOutline2Mesh(dict)