Changeset 17617

Timestamp:

04/01/14 10:37:26 (11 years ago)

Author:

cborstad

Message:

CHG: fill nan's by default since matplotlib doesn't handle them

Location:

issm/trunk-jpl/src/m/plot

Files:

• plotmodel.py (modified) (2 diffs)
• processdata.py (modified) (1 diff)

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

@@ -24 +24 @@
         figurenumber=options.figurenumber
         numberofplots=options.numberofplots
+
+        #get hold
+        hold=options.list[0].getfieldvalue('hold',False)
 
         #if nlines and ncols specified, then bypass
@@ -52 +55 @@
                 #handling the 'visible' option will need some check on whether ipython is currently in interactive or non-interactive mode
 
-                #clear any previous plot window
-                p.clf()
+                if not hold:
+                        p.clf()
 
                 #if figsize specified

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

@@ -41 +41 @@
         
         #process NaN's if any
-        if options.exist('nan'):
-                data[npy.isnan(data)]=options.getfieldvalue('nan',0)
+        nanfill=options.getfieldvalue('nan',0)
+        if npy.any(npy.isnan(data)):
+                data[npy.isnan(data)]=nanfill
+                print "WARNING: nan's treated as zeros by default.  Change using pairoption 'nan',nan_fill_value in plotmodel call"
 
         #non-patch processing