Changeset 1911 for inundation/pyvolution/data_manager.py

Timestamp:

Oct 14, 2005, 6:44:45 AM (19 years ago)

Author:

ole

Message:

Refactored pyvolution to use polygon functionality from new utilities package

File:

• inundation/pyvolution/data_manager.py (modified) (6 diffs)

inundation/pyvolution/data_manager.py

@@ -1261 +1261 @@
 
     from Numeric import array, Float, concatenate, NewAxis, zeros, reshape, sometrue 
-
+    from utilities.polygon import inside_polygon
+    
     msg = 'Format must be either asc or ers'
     assert format.lower() in ['asc', 'ers'], msg
@@ -1399 +1400 @@
     #Interpolate
     from least_squares import Interpolation
-    from util import inside_polygon
+    
 
     #FIXME: This should be done with precrop = True (?), otherwise it'll
@@ -2880 +2881 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros,\
          sometrue
-
+    from utilities.polygon import inside_polygon
 
     #FIXME: Should be variable
@@ -2984 +2985 @@
     #Interpolate
     from least_squares import Interpolation
-    from util import inside_polygon
+    
 
     #FIXME: This should be done with precrop = True, otherwise it'll
@@ -3097 +3098 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros, reshape, sometrue 
     import ermapper_grids
+    from utilities.polygon import inside_polygon    
 
     header = {}
@@ -3202 +3204 @@
     #Interpolate
     from least_squares import Interpolation
-    from util import inside_polygon
+    
 
     #FIXME: This should be done with precrop = True (?), otherwise it'll