Changeset 21283

Timestamp:

10/18/16 01:05:04 (8 years ago)

Author:

bdef

Message:

CHG: colormap treatment grid subplot tweak NEW: BC ability plotdoc

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.py (modified) (4 diffs)
• checkplotoptions.py (modified) (1 diff)
• plot_BC.py (added)
• plot_icefront.py (added)
• plot_manager.py (modified) (2 diffs)
• plot_mesh.py (modified) (2 diffs)
• plot_quiver.py (modified) (2 diffs)
• plot_unit.py (modified) (4 diffs)
• plotdoc.py (added)
• plotmodel.py (modified) (6 diffs)
• processdata.py (modified) (5 diffs)

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

@@ -165 +165 @@
                 options.addfielddefault('clim',lims)
         else:
-                if len(data)>0: lims=[data.min(),data.max()]
-                else: lims=[0,1]
+                if len(data)>0: 
+                        lims=[data.min(),data.max()]
+                else: 
+                        lims=[0,1]
         # }}}
         # {{{ shading TODO
@@ -177 +179 @@
         # }}}
         # {{{ colormap
-        # default sequential colormap
-        defaultmap=truncate_colormap(mpl.cm.gnuplot2,0.1,0.9,128)
-        cmap=options.getfieldvalue('colormap',defaultmap)
-        if options.exist('log'):
-                norm = mpl.colors.LogNorm(vmin=lims[0], vmax=lims[1])
-        else:
-                norm = mpl.colors.Normalize(vmin=lims[0], vmax=lims[1])
-        options.addfield('colornorm',norm)
-        if options.exist('cmap_set_bad'):
-                NaNcolor=options.getfieldvalue('cmap_set_bad','w')
-                cmap.set_bad(NaNcolor,1.0)
+        if options.exist('colornorm'):
+                norm=options.getfieldvalue('colornorm')
+        if options.exist('colormap'):
+                cmap=options.getfieldvalue('colormap')
         cbar_extend=0
         if options.exist('cmap_set_over'):
-                over=options.getfieldvalue('cmap_set_over','0.5')
-                cmap.set_over(over)
                 cbar_extend+=1
         if options.exist('cmap_set_under'):
-                under=options.getfieldvalue('cmap_set_under','0.5')
-                cmap.set_under(under)
                 cbar_extend+=2
-        options.addfield('colormap',cmap)
         # }}}
         # {{{ contours
@@ -215 +205 @@
                 elif cbar_extend==3:
                         extend='both'
-                cb = mpl.colorbar.ColorbarBase(ax.cax, cmap=cmap, norm=norm, extend=extend)
+                cb = mpl.colorbar.ColorbarBase(ax.cax,cmap=cmap, norm=norm, extend=extend)
                 if options.exist('alpha'):
                         cb.set_alpha(options.getfieldvalue('alpha'))
@@ -246 +236 @@
                 plt.sca(ax) # return to original axes control
         # }}}
-        # {{{ expdisp
-        if options.exist('expdisp'):
-            expdisp(ax,options)
+        # {{{ expdisp TOFIX
+        # if options.exist('expdisp'):
+        #       expdisp(ax,options)
         # }}}
         # {{{ area TODO

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

@@ -151 +151 @@
         # {{{ scale ruler
         if options.exist('scaleruler'):
-                if 'on' in options.exist('scaleruler','on'):
+                if 'on' in options.getfieldvalue('scaleruler','off'):
                         Lx=max(md.mesh.x)-min(md.mesh.x)
                         Ly=max(md.mesh.y)-min(md.mesh.y)
-                        options.changefieldvalue('scaleruler',[min(md.mesh.x)+6./8.*Lx, min(md.mesh.y)+1./10.*Ly, 10**(ceil(log10(Lx)))/5, floor(Lx/100), 5])
+                        options.changefieldvalue('scaleruler',[min(md.mesh.x)+6./8.*Lx, min(md.mesh.y)+1./10.*Ly, 10**(np.ceil(np.log10(Lx)))/5, np.floor(Lx/100), 5])
         # }}}
         # {{{ log scale

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

@@ -7 +7 @@
 from checkplotoptions import checkplotoptions
 from plot_mesh import plot_mesh
+from plot_BC import plot_BC
 from processmesh import processmesh
 from processdata import processdata
@@ -57 +58 @@
         # {{{ dealing with special plot (mesh for now)
         if isinstance(data,(str,unicode)):
-                # convert string to lower case for a case-insensitive comparison
-                if data.lower()=='mesh': 
-                        plot_mesh(md,options,ax)
-                        applyoptions(md,[],options,fig,ax)
-                        fig.delaxes(fig.axes[1]) # hack to remove colorbar after the fact
+                if data=='mesh': 
+                        plot_mesh(md,options,fig,ax)
+                        #fig.delaxes(fig.axes[1]) # hack to remove colorbar after the fact
                         return
-                elif data.lower()=='none':
+                elif data=='BC': 
+                        plot_BC(md,options,fig,ax)
+                        return
+                elif data=='none':
                         print 'no data provided to plot (TODO: write plot_none.py)'
                         applyoptions(md,[],options,fig,ax)

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

@@ -7 +7 @@
 from applyoptions import applyoptions
 
-def plot_mesh(md,options,ax):
+def plot_mesh(md,options,fig,ax):
         '''
         PLOT_MESH - plot model mesh
@@ -28 +28 @@
         options.addfielddefault('colorbar','off')
         options.addfielddefault('ticklabels','on')
+        applyoptions(md,[],options,fig,ax)

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

@@ -14 +14 @@
                 color=datanorm
         #scaling of arrow length (giving info to change as it seems that there is no better way to work arround it)
-        scale=options.getfieldvalue('scale',scaler)
-        print('the current value for scale is {}, increase it to shorten the arrows'.format(scale))
+        scale=options.getfieldvalue('scaling',scaler)
+        print('the current value for "scaling" is {}, increase it to shorten the arrows'.format(scale))
         #sizing of the arrows
         width=options.getfieldvalue('width',5.0e-3)
@@ -32 +32 @@
                                                                 angles='xy')
         else:
+                if options.exist('colornorm'):
+                        norm=options.getfieldvalue('colornorm')
+                if options.exist('colormap'):
+                        cmap=options.getfieldvalue('colormap')          
                 Q=ax.quiver(x,y,vx,vy,color,cmap=cmap,norm=norm,
                                                                 scale=scale,scale_units='xy',

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

@@ -29 +29 @@
         # {{{ define wich colormap to use 
         try:
-                defaultmap=plt.cm.viridis
+                defaultmap=plt.cm.get_cmap('viridis',colorlevels)
         except AttributeError:
                 print("Viridis can't be found (probably too old Matplotlib) reverting to gnuplot colormap")
-                defaultmap=truncate_colormap(mpl.cm.gnuplot2,0.1,0.9,128)
+                defaultmap=truncate_colormap('gnuplot2',0.1,0.9,colorlevels)
         cmap=options.getfieldvalue('colormap',defaultmap)
         if options.exist('cmap_set_over'):
@@ -40 +40 @@
                 under=options.getfieldvalue('cmap_set_under','0.5')
                 cmap.set_under(under)
+        options.addfield('colormap',cmap)
         # }}}   
         # {{{ Get the colormap limits
@@ -57 +58 @@
         else:
                 norm = mpl.colors.Normalize(vmin=lims[0], vmax=lims[1])
+        if options.exist('log'):
+                norm = mpl.colors.LogNorm(vmin=lims[0], vmax=lims[1])
+        else:
+                norm = mpl.colors.Normalize(vmin=lims[0], vmax=lims[1])
+        options.addfield('colornorm',norm)
         # }}}
         
@@ -81 +87 @@
                                 triangles=mpl.tri.Triangulation(x,y,elements)
                         ax.tricontourf(triangles,data,colorlevels,cmap=cmap,norm=norm,alpha=alpha)
-#                       ax.tricontourf(triangles,data,colorlevels,cmap=cmap,norm=norm,alpha=alpha,extend='both')
                         if edgecolor != 'None':
                                 ax.triplot(x,y,elements,color=edgecolor)

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

@@ -1 +1 @@
 import numpy as np
 from plotoptions import plotoptions
+from plotdoc import plotdoc
 
 try:
@@ -13 +14 @@
 
 def plotmodel(md,*args):
-        '''     at command prompt, type 'plotdoc' for additional documentation
+        '''     at command prompt, type 'plotdoc()' for additional documentation
         '''
 
@@ -21 +22 @@
         #get number of subplots
         subplotwidth=ceil(sqrt(options.numberofplots))
-        
         #Get figure number and number of plots
         figurenumber=options.figurenumber
@@ -52 +52 @@
         #Go through plots
         if numberofplots:
-                
                 #if plt.fignum_exists(figurenumber): 
                 #       plt.cla()
@@ -64 +63 @@
                 fig.clf()
 
+                backgroundcolor=options.list[0].getfieldvalue('backgroundcolor',(0.7,0.7,0.7))
+                fig.set_facecolor(backgroundcolor)
+
+
+                translator={'on':'each',
+                                                                'off':'None',
+                                                                'one':'single'}
                 # options needed to define plot grid
+                plotnum=options.numberofplots
                 direction=options.list[0].getfieldvalue('direction','row') # row,column
                 axes_pad=options.list[0].getfieldvalue('axes_pad',0.25)
                 add_all=options.list[0].getfieldvalue('add_all',True) # True,False
                 share_all=options.list[0].getfieldvalue('share_all',True) # True,False
-                label_mode=options.list[0].getfieldvalue('label_mode','1') # 1,L,all
-                cbar_mode=options.list[0].getfieldvalue('cbar_mode','each') # none,single,each
-                cbar_location=options.list[0].getfieldvalue('cbar_location','right') # right,top
-                cbar_size=options.list[0].getfieldvalue('cbar_size','5%')
-                cbar_pad=options.list[0].getfieldvalue('cbar_pad','2.5%') # None or %
+                label_mode=options.list[0].getfieldvalue('label_mode','L') # 1,L,all
+                colorbar=options.list[0].getfieldvalue('colorbar','on') # on, off (single)
+                cbar_mode=translator[colorbar]
+                cbar_location=options.list[0].getfieldvalue('colorbarpos','right') # right,top
+                cbar_size=options.list[0].getfieldvalue('colorbarsize','5%')
+                cbar_pad=options.list[0].getfieldvalue('colorbarpad','2.5%') # None or %
                 
                 axgrid=ImageGrid(fig, 111,
                                 nrows_ncols=(nrows,ncols),
+                                ngrids=plotnum,
                                 direction=direction,
                                 axes_pad=axes_pad,
@@ -88 +97 @@
                                 )
 
-                if cbar_mode=='none':
-                        for ax in axgrid.cbar_axes: fig._axstack.remove(ax)
+                if cbar_mode=='off':
+                        for ax in axgrid.cbar_axes: 
+                                fig._axstack.remove(ax)
 
                 for i in xrange(numberofplots):

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

@@ -1 @@
-from math import isnan
 import numpy as np
 
@@ -18 +17 @@
         # {{{ Initialisation and grabbing auxiliaries
         # check format
-        if (len(data)==0 or (len(data)==1 and not isinstance(data,dict) and isnan(data).all())):
+        if (len(data)==0 or (len(data)==1 and not isinstance(data,dict) and np.isnan(data).all())):
                 raise ValueError("processdata error message: 'data' provided is empty")
+        # get the shape
         if 'numberofvertices2d' in dir(md.mesh):
                 numberofvertices2d=md.mesh.numberofvertices2d
@@ -29 +29 @@
         #initialize datatype
         datatype=0
-        # init patches
         # get datasize
         if np.ndim(procdata)==1:
-                datasize=np.array([len(procdata),1])
+                datasize=(np.shape(procdata)[0],1)
+        elif np.ndim(procdata)==2:
+                datasize=np.shape(procdata)
+        elif np.ndim(procdata)==3:
+                if np.shape(procdata)[0]==2:
+                        #treating a dim two list that needs to be stacked
+                        procdata=np.hstack((procdata[0,:,:],procdata[1,:,:]))
+                        datasize=np.shape(procdata)
+                else:
+                        raise ValueError('data list contains more than two vectore, we can not cope with that')
         else:
-                datasize=np.shape(procdata)
-                if len(datasize)>2:
-                        raise ValueError('data passed to plotmodel has more than 2 dimensions; check that column vectors are rank-1')
+                raise ValueError('data passed to plotmodel has bad dimensions; check that column vectors are rank-1')
   # }}}      
         # {{{ process NaN's if any
@@ -66 +72 @@
         # }}}  
         # {{{ element data
+
         if datasize[0]==md.mesh.numberofelements and datasize[1]==1:
-                print'ploting elements'
                 #initialize datatype if non patch
                 if datatype!=4 and datatype!=5:
@@ -85 +91 @@
                                 print('plotmodel warning: mask length not supported yet (supported length are md.mesh.numberofvertices and md.mesh.numberofelements')
                 # }}}  
+
         # }}}  
         # {{{ node data
         if datasize[0]==md.mesh.numberofvertices and datasize[1]==1:
-                print'ploting nodes'
                 datatype=2
                 # {{{ Mask