Changeset 17654

Timestamp:

04/04/14 19:47:11 (11 years ago)

Author:

cborstad

Message:

NEW: overlay plotting capability in python

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.py (modified) (6 diffs)
• plot_overlay.py (added)
• plot_unit.py (modified) (2 diffs)

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

@@ -1 @@
-
 try:
         import pylab as p
@@ -11 +10 @@
 from plot_unit import plot_unit
 from applyoptions import applyoptions
+from plot_overlay import plot_overlay
 
 def plot_manager(md,options,subplotwidth,nlines,ncols,i):
@@ -24 +24 @@
         #parse options and get a structure of options
         options=checkplotoptions(md,options)
-        #print 'options:', options
 
         #get data to be plotted
         data=options.getfieldvalue('data');
+
+        #initialize plot handle variable
+        handle=None
+
+        ##basemap plot
+        #if options.exist('basemap'):
+        #       plot_basemap(md,data,options,nlines,ncols,i)
+
+        #overlay plot
+        if options.exist('overlay'):
+                handle=plot_overlay(md,data,options,nlines,ncols,i)
+                options.addfielddefault('alpha',0.5)
+                options.addfielddefault('xlim',[min(md.mesh.x),max(md.mesh.x)])
+                options.addfielddefault('ylim',[min(md.mesh.y),max(md.mesh.y)])
 
         #figure out if this is a special plot
@@ -36 +49 @@
                         plot_mesh(md,options,nlines,ncols,i)
                         return
+                elif data.lower()=='none':
+                        print 'no data provided to plot (TODO: write plot_none.py)'
+                        return
                 else:
                         print "WARNING: '%s' is not implemented or is not a valid string for option 'data'" % data
@@ -42 +58 @@
         #else:
                 #print "'data' not a string, plotting model properties yet to be implemented..."
-
-        #Overlay plot
 
         #Gridded plot
@@ -56 +70 @@
 
         #standard plot
-        p.subplot(nlines,ncols,i,aspect='equal')
+        if not handle:
+                p.subplot(nlines,ncols,i,aspect='equal')
 
         #plot unit

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

@@ -21 +21 @@
    #number of colorlevels for plots
    colorlevels=options.getfieldvalue('colorlevels',256)
-   
+
+   alpha=options.getfieldvalue('alpha',1)
+
    #colormap
    cmap=options.getfieldvalue('colormap',mpl.cm.gnuplot2)
@@ -50 +52 @@
         #node plot
         if is2d:
-                p.tricontourf(x,y,elements,data,colorlevels,cmap=cmap,norm=norm)
+                p.tricontourf(x,y,elements,data,colorlevels,cmap=cmap,norm=norm,alpha=alpha)
                 if edgecolor != 'None':
                         p.triplot(x,y,elements,color=edgecolor)