Changeset 17989 for issm/trunk/src/m/plot/plotmodel.py

Timestamp:

05/13/14 11:58:30 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17986

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/plotmodel.py (modified) (3 diffs)

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

@@ -42 +42 @@
                 nc=True
         else:
-                ncols=subplotwidth
+                ncols=int(subplotwidth)
                 nc=False
+        ncols=int(ncols)
+        nrows=int(nrows)
         
         #check that nrows and ncols were given at the same time!
@@ -52 +54 @@
         if numberofplots:
                 
-                if not hold: # TODO need to also check whether figurenumber is a new plot so that old plots are not mistakenly cleared
+                if plt.fignum_exists(figurenumber): 
                         plt.cla()
 
@@ -58 +60 @@
                 if options.list[0].exist('figsize'):
                         figsize=options.list[0].getfieldvalue('figsize')
-                        fig=plt.figure(figurenumber,figsize=figsize,tight_layout=True)
+                        fig=plt.figure(figurenumber,figsize=(figsize[0],figsize[1]),tight_layout=True)
                 else:
                         fig=plt.figure(figurenumber,tight_layout=True)
                 fig.clf()
-        
-                # options to pass: axes_pad, share_all, label_mode ("1","L","all"), cbar_mode (none,single,each), cbar_location(right,top)
+
+                # options needed to define plot grid
+                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 %
+                
                 axgrid=ImageGrid(fig, 111,
                                 nrows_ncols=(nrows,ncols),
-                                direction='row',
-                                axes_pad=0.05,
-                                add_all=True,
-                                share_all=True,
-                                label_mode='all',
-                                cbar_mode='single',
-                                cbar_location='right',
-                                cbar_size='5%',
-                                cbar_pad=0.05
+                                direction=direction,
+                                axes_pad=axes_pad,
+                                add_all=add_all,
+                                share_all=share_all,
+                                label_mode=label_mode,
+                                cbar_mode=cbar_mode,
+                                cbar_location=cbar_location,
+                                cbar_size=cbar_size,
+                                cbar_pad=cbar_pad
                                 )
+
+                if cbar_mode=='none':
+                        for ax in axgrid.cbar_axes: fig._axstack.remove(ax)
 
                 for i in xrange(numberofplots):
                         plot_manager(options.list[i].getfieldvalue('model',md),options.list[i],fig,axgrid[i])
 
-                plt.show()
+                fig.show()
         else:
                 raise StandardError('plotmodel error message: no output data found.')