Changeset 2908

Timestamp:

May 18, 2006, 11:57:18 AM (18 years ago)

Author:

sexton

Message:

changes to plotting polygons

Files:

• inundation/pyvolution/util.py (modified) (5 diffs)
• production/onslow_2006/onslow_data_extent.png (modified) (previous)
• production/onslow_2006/plot_data_extent.py (modified) (1 diff)
• production/pt_hedland_2006/pt_hedland_data_extent.png (modified) (previous)
• production/pt_hedland_2006/run_pt_hedland.py (modified) (2 diffs)

inundation/pyvolution/util.py

@@ -900 +900 @@
 def plot_polygons(bounding_polygon,
                   interior_polygon,
+                  figname,
                   verbose = False):
     
@@ -909 +910 @@
     
     interior_polygon - list of polygons used in create_mesh_from_regions
-                    
-                      
-    Output:
-    
-    - plot named = polygon_plot.png 
-
-                      
+                        
+    figname          - name to save figure to
+                   
     """
 
@@ -921 +918 @@
     k = _plot_polygons(bounding_polygon,
                        interior_polygon,
+                       figname,
                        verbose)
 
@@ -927 +925 @@
 def _plot_polygons(bounding_polygon,
                    interior_polygon,
+                   figname,
                    verbose = False):   
 
@@ -944 +943 @@
     for i in range(len(interior_polygon)):
         x_int, y_int = poly_xy(interior_polygon[i])
-        plot(x_bound,y_bound,'r-',x_int,y_int,'g-')
+        plot(x_bound,y_bound,'r-',x_int,y_int,'r-')
         xlabel('x')
         ylabel('y')
 
-    savefig('polygon_plot')
+    savefig(figname)
 
     close('all')

production/onslow_2006/plot_data_extent.py

@@ -6 +6 @@
 from utilities.polygon import inside_polygon
 import project
-
+from pyvolution.util import plot_polygons
 
 datadir = project.datadir
 ion()
-hold(False)
+
+plot_data = True
+plot_with_poly = False
+
+if plot_data == True:
+    file1 = datadir+'onslow_onshore_30m_dted.pts'
+    file2 = datadir+'onslow_offshore_points.xya'
+
+    G1 = Geospatial_data(file_name = file1)
+    G2 = Geospatial_data(file_name = file2)
+
+    pts1 = G1.get_data_points(absolute = True)
+    pts2 = G2.get_data_points(absolute = True)
+
+    if plot_with_poly == True:
+        figname = 'onslow_data_poly'
+        figure(1)
+        plot(pts1[:,0],pts1[:,1],'g.',
+             pts2[:,0],pts2[:,1],'b.')
+        plot_polygons(project.polyAll,
+                      [project.poly_onslow, project.poly_coast, project.poly_region],
+                      figname,
+                      verbose = True)
+        axis([])
+        savefig(figname)
+    else:
+        figure(2)
+        plot(pts1[:,0],pts1[:,1],'g.',
+             pts2[:,0],pts2[:,1],'b.')
+        xlabel('x')
+        ylabel('y')
+        savefig('onslow_data_extent')
+else:
     
-file1 = datadir+'onslow_onshore_30m_dted.pts'
-file2 = datadir+'onslow_offshore_points.xya'
+    figure(3)
+    figname = 'onslow_polys'
+    plot_polygons(project.polyAll,
+                 [project.poly_onslow, project.poly_coast, project.poly_region],
+                  figname,
+                  verbose = True)
 
-G1 = Geospatial_data(file_name = file1)
-G2 = Geospatial_data(file_name = file2)
-
-pts1 = G1.get_data_points(absolute = True)
-pts2 = G2.get_data_points(absolute = True)
-z1 = G1.get_attributes()
-z2 = G2.get_attributes()
-
-minz1 = min(z1)
-maxz1 = max(z1)
-minz2 = min(z2)
-maxz2 = max(z2)
-
-print ''
-print 'Offshore elevation in range [%.2f %.2f]   ' %(minz1, maxz1)
-print 'Onshore elevation in range [%.2f %.2f]   ' %(minz2, maxz2)
-print ''
-
-minelev = min(minz1,minz2)
-maxelev = max(maxz1,maxz2)
-
-# bounding polygon for Onslow scenario
-polygon_bound = project.polyAll
-
-x_bound = []
-y_bound = []
-n = len(polygon_bound)
-for i in range(n+1):
-    if i == n:
-        thispt = polygon_bound[0]
-    else:
-        thispt = polygon_bound[i]
-    x_bound.append(thispt[0])
-    y_bound.append(thispt[1])
-
-# interior regions
-figure(1)
-plot(pts1[:,0],pts1[:,1],'g.',
-     pts2[:,0],pts2[:,1],'b.',
-     x_bound,y_bound,'r-')
-#title('Offhore (g) and onshore (b) data: Onslow scenario. \n Elevation in range [%.2f %.2f]' %(minelev, maxelev))
-xlabel('x')
-ylabel('y')
-savefig('onslow_data_extent')
-
-
+close('all')

production/pt_hedland_2006/run_pt_hedland.py

@@ -139 +139 @@
         count += 1
 
+figname = 'pt_hedland_polys'
 plot_polygons(project.polyAll,
               [project.poly_pt_hedland, project.poly_region],
+              figname,
               verbose = True)
 
@@ -147 +149 @@
 else:
     print 'check out your interior polygons'
-    print 'check polygon_plot.png in production directory'
+    print 'check %s in production directory' %figname
     import sys; sys.exit()