Changeset 3072 for inundation/pyvolution/mesh.py

Timestamp:

Jun 5, 2006, 12:03:41 PM (18 years ago)

Author:

ole

Message:

Made boundary polygon return absolute UTM coordinates as per ticket:81

File:

• inundation/pyvolution/mesh.py (modified) (8 diffs)

inundation/pyvolution/mesh.py

@@ -426 +426 @@
 
 
-    def get_boundary_polygon(self, verbose = False):
+    def get_boundary_polygon(self, verbose=False):
         """Return bounding polygon for mesh (counter clockwise)
 
@@ -432 +432 @@
         If multiple vertex values are present, the algorithm will select the
         path that contains the mesh.
+
+        All points are in absolute UTM coordinates
         """
         
@@ -438 +440 @@
 
 
-        # FIXME (Ole): Make sure all points are absolute UTM    
-        
         # Get mesh extent
-        xmin, xmax, ymin, ymax = self.get_extent() # FIXME: Make Absolute
+        xmin, xmax, ymin, ymax = self.get_extent(absolute=True)
         pmin = ensure_numeric([xmin, ymin])
         pmax = ensure_numeric([xmax, ymax])        
@@ -456 +456 @@
             if edge_id == 2: a = 0; b = 1
 
-            # FIXME: Make Absolute
-            A = self.get_vertex_coordinate(i, a) # Start
-            B = self.get_vertex_coordinate(i, b) # End
+            A = self.get_vertex_coordinate(i, a, absolute=True) # Start
+            B = self.get_vertex_coordinate(i, b, absolute=True) # End
+
 
             # Take the point closest to pmin as starting point
@@ -488 +488 @@
 
 
-
+            
         #Start with smallest point and follow boundary (counter clock wise)
         polygon = [p0]      # Storage for final boundary polygon
-        point_registry = {} # Keep track of storage to avoid multiple runs around boundary
-                            # This will only be the case if there are more than one candidate
-                            # FIXME (Ole): Perhaps we can do away with polygon and use
-                            # only point_registry to save space.
+        point_registry = {} # Keep track of storage to avoid multiple runs around
+                            # boundary. This will only be the case if there are
+                            # more than one candidate.
+                            # FIXME (Ole): Perhaps we can do away with polygon
+                            # and use only point_registry to save space.
 
         point_registry[tuple(p0)] = 0                            
@@ -509 +510 @@
 
                 if verbose:
-                    print 'Point %s has multiple candidates: %s' %(str(p0), candidate_list)
+                    print 'Point %s has multiple candidates: %s'\
+                          %(str(p0), candidate_list)
 
 
@@ -516 +518 @@
                     v_prev = p0 - polygon[-2] # Vector that leads to p0
                 else:
-                    # FIXME (Ole): What do we do if the first point has multiple candidates?
+                    # FIXME (Ole): What do we do if the first point has multiple
+                    # candidates?
                     # Being the lower left corner, perhaps we can use the
                     # vector [1, 0], but I really don't know if this is completely
@@ -530 +533 @@
                     vc = pc-p0  # Candidate vector
                     
-                    # Angle between each candidate and the previous vector in [-pi, pi]
+                    # Angle between each candidate and the previous vector
+                    # in [-pi, pi]
                     ac = angle(vc, v_prev)
                     if ac > pi: ac = pi-ac