Changeset 21276

Timestamp:

10/15/16 14:33:24 (8 years ago)

Author:

cborstad

Message:

CHG: push options parsing to the expdisp function to facilitate adding new options (patch fill to come), and to streamline applyoptions

Location:

issm/trunk-jpl/src/m

Files:

• exp/expdisp.py (modified) (2 diffs)
• plot/applyoptions.py (modified) (1 diff)

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

@@ -2 +2 @@
 import numpy as np
 
-def expdisp(domainoutline,ax,linestyle='--k',linewidth=1,unitmultiplier=1.):
+def expdisp(ax,options):
     '''
     plot the contents of a domain outline file
 
-    This routine reads in a domain outline file and plots all of the x,y contours
+    This routine reads in an exp file and plots all of the x,y points/lines/patches
 
-    'ax' is a handle to the current plot axes, onto which the contours are to be drawn
+    'ax' is a handle to the current plot axes, onto which we want to plot
 
     Usage:
@@ -17 +17 @@
     '''
 
-    domain=expread(domainoutline)
+    filename=options.getfieldvalue('expdisp')
+    style=options.getfieldvalue('expstyle','k')
+    linewidth=options.getfieldvalue('explinewidth',1)
+    unitmultiplier=options.getfieldvalue('unit',1)
+    for i in xrange(len(filename)):
+        filenamei=filename[i]
+        stylei=style[i]
+        if type(linewidth)==list:
+            linewidthi=linewidth[i]
+        else:
+            linewidthi=linewidth
 
-    for i in xrange(len(domain)):
-        if domain[i]['nods']==1:
-            ax.plot(domain[i]['x']*unitmultiplier,domain[i]['y']*unitmultiplier,'o',mec='k',mfc='r',ms=10)
-        else:
-            x=domain[i]['x'].tolist() # since expread returns a string representation of the arrays
-            y=domain[i]['y'].tolist()
-            ax.plot(x*unitmultiplier,y*unitmultiplier,linestyle,linewidth=linewidth)
+        domain=expread(filenamei)
+        for i in xrange(len(domain)):
+            if domain[i]['nods']==1:
+                ax.plot(domain[i]['x']*unitmultiplier,domain[i]['y']*unitmultiplier,'o',mec='k',mfc='r',ms=10)
+            else:
+                x=domain[i]['x'].tolist() # since expread returns a string representation of the arrays
+                y=domain[i]['y'].tolist()
+                ax.plot(x*unitmultiplier,y*unitmultiplier,stylei,linewidth=linewidthi)

issm/trunk-jpl/src/m/plot/applyoptions.py

@@ -248 +248 @@
         # {{{ expdisp
         if options.exist('expdisp'):
-                filename=options.getfieldvalue('expdisp')
-                style=options.getfieldvalue('expstyle','k')
-                linewidth=options.getfieldvalue('explinewidth',1)
-                for i in xrange(len(filename)):
-                        filenamei=filename[i]
-                        stylei=style[i]
-                        if type(linewidth)==list:
-                                linewidthi=linewidth[i]
-                        else:
-                                linewidthi=linewidth
-                        expdisp(filenamei,ax,linestyle=stylei,linewidth=linewidthi,unitmultiplier=options.getfieldvalue('unit',1))
+            expdisp(ax,options)
         # }}}
         # {{{ area TODO