Changeset 587 for trunk

Timestamp:

Mar 19, 2012, 10:23:14 AM (13 years ago)

Author:

aslmd

Message:

UTIL PYTHON : added cycling through linestyles. note also that -T for 1D plots now adds crosses but does not make the line disappear.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (5 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -756 +756 @@
     #print "NEW MIN ", min(what_I_plot)
     what_I_plot[ what_I_plot > 9e+35  ] = -9e+35
-    what_I_plot[ what_I_plot > zevmax ] = zevmax
+    what_I_plot[ what_I_plot > zevmax ] = zevmax*(1. - 1.e-7)
     #print "NEW MAX ", max(what_I_plot)
     return what_I_plot

trunk/UTIL/PYTHON/planetoplot.py

@@ -86 +86 @@
     import subprocess
     #from singlet import singlet
+    from itertools import cycle
 
 #########################
@@ -214 +215 @@
                  indices[iii,jjj,:] = bidimfind(lon2d,lat2d,vlon,vlat,file=iwantawhereplot)  
                  lonp,latp = ( lon2d[indices[iii,jjj,0],indices[iii,jjj,1]] , lat2d[indices[iii,jjj,0],indices[iii,jjj,1]] )
+              ### possible bug here if several --lat
               for iii in range(numlon):
                for jjj in range(numlat):
@@ -344 +346 @@
     ### Time loop for plotting device
     nplot = 1 ; error = False 
+    linecycler = cycle(["-","--","-.",":"])
     print "********************************************"
     while error is False:
@@ -423 +426 @@
                if mapmode == 0:    ### could this be moved inside imov loop ?
                    itime=indextime
-                   if len(what_I_plot.shape) is 3: itime=[0]
+                   if len(what_I_plot.shape) == 3: itime=[0]
                    m = None ; x = None ; y = None
                    what_I_plot, x, y = define_axis(lon,lat,vert,time,indexlon,indexlat,indexvert,\
@@ -491 +494 @@
                         if mrate is not None: x = y  ## because swapaxes...
                         #what_I_plot_frame = np.diff(what_I_plot_frame, n=1) ; x = x[1:]
-                        
-                        if not tile:  zeline='-'
-                        else:         zeline=','
+                      
+                        zeline = next(linecycler) ## "-" for simple lines
+                        if tile:      zemarker = 'x'
+                        else:         zemarker = None 
                         this_is_a_regular_plot = (indexvert is not None) or (indextime is None) or (indexlat is None) or (indexlon is None)
-                        if this_is_a_regular_plot:   plot(x,what_I_plot_frame,zeline,label=lbl)  ## vertical profile
-                        else:                        plot(what_I_plot_frame,x,zeline,label=lbl)  ## regular plot
+                        if this_is_a_regular_plot:   plot(x,what_I_plot_frame,zeline,label=lbl,marker=zemarker)  ## vertical profile
+                        else:                        plot(what_I_plot_frame,x,zeline,label=lbl,marker=zemarker)  ## regular plot
                         if nplot > 1: legend(loc='best')
                         if indextime is None and axtime is not None and xlab is None:    xlabel(axtime.upper()) ## define the right label