Changeset 19421

Timestamp:

07/03/15 00:41:51 (10 years ago)

Author:

cborstad

Message:

CHG:Python: adding expdisp module; updating expwrite so that a dict is passed rather than a list of dicts to fix a bug with multiple contours/polygons/lines in a shapefile

Location:

issm/trunk-jpl/src/m/exp

Files:

• expdisp.py (added)
• expwrite.py (modified) (2 diffs)

issm/trunk-jpl/src/m/exp/expwrite.py

@@ -3 +3 @@
 def expwrite(contours,filename):
         """
-        EXPWRITE - write an Argus file from a structure given in input
+        EXPWRITE - write an Argus file from a dictionary given in input
 
-           This routine writes an Argus file from a list of dict's containing the fields:
+           This routine writes an Argus file from a dict containing the fields:
            x and y of the coordinates of the points.
            The first argument is the list containing the points coordinates 
@@ -20 +20 @@
 
         fid=open(filename,'w')
-        for contour in contours:
-                if numpy.size(contour['x'])!=numpy.size(contour['y']):
+        for x,y in zip(contours['x'],contours['y']):
+                #if numpy.size(contour['x'])!=numpy.size(contour['y']):
+                if len(x)!=len(y):
                         raise RuntimeError("contours x and y coordinates must be of identical size")
-   
-                if 'name' in contour:
+                if 'name' in contours:
                         fid.write("%s%s\n" % ('## Name:',contour['name']))
                 else:
                         fid.write("%s%s\n" % ('## Name:',filename))
    
-                #Add density if it's not there
-                if 'density' not in contour:
-                        contour['density']=1
+                #Add density if it's not there FIXME what is this ever used for?
+                #if 'density' not in contours:
+                #       contours['density']=1
+                density=1
 
                 fid.write("%s\n" % '## Icon:0')
                 fid.write("%s\n" % '# Points Count Value')
-                fid.write("%i %f\n" % (numpy.size(contour['x']),contour['density']))
+                #fid.write("%i %f\n" % (numpy.size(contour['x']),contour['density']))
+                fid.write("%i %f\n" % (numpy.size(x),density))
                 fid.write("%s\n" % '# X pos Y pos')
-                for x,y in zip(contour['x'],contour['y']):
-                        fid.write("%10.10f %10.10f\n" % (x,y))
+                #for x,y in zip(contour['x'],contour['y']):
+                for xi,yi in zip(x,y):
+                        fid.write("%10.10f %10.10f\n" % (xi,yi))
                 fid.write("\n")