Changeset 1476 in lmdz_wrf

Timestamp:

Mar 31, 2017, 3:05:59 PM (8 years ago)

Author:

lfita

Message:

Improving 'draw_Nlines':

Adding '*' for no label
Adding 'vrange' for the plot

Location:

trunk/tools

Files:

• drawing.py (modified) (5 diffs)
• drawing_tools.py (modified) (5 diffs)

trunk/tools/drawing.py

@@ -2165 +2165 @@
     draw_lines(ncfilens, values, varname):
       ncfilens= [filen] ',' separated list of netCDF files
-      values= [dimvname]:[valuesaxis]:[dimtit]:[dimxyfmt]:[leglabels]:[vtit]:[title]:[legvals]:[colns]:[lines]
+      values= [dimvname]:[valuesaxis]:[dimtit]:[dimxyfmt]:[vrange]:[leglabels]:[vtit]:[title]:[legvals]:[colns]:[lines]
        [points]:[lwdths]:[psizes]:[freqv]:[figname]:[graphk]:[close]
         [dimvname]: ',' list of names of the variable with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
-        [dimtit]: title for the common dimension
+        [dimtit]: title for the common dimension ('|' for spaces)
         [dimxyfmt]=[dxs],[dxf],[Ndx],[ordx],[dys],[dyf],[Ndy],[ordx]: format of the values at each axis (or 'auto')
           [dxs]: style of x-axis ('auto' for 'pretty')
@@ -2182 +2182 @@
           [Ndy]: Number of ticks at the y-axis ('auto' for 5)
           [ordy]: angle of orientation of ticks at the y-axis ('auto' for horizontal)
-        [leglabels]: ',' separated list of names for the legend ('!' for spaces)
+        [vrange]=[ymin],[ymax] range for the plot ('auto' for current range of values)
+        [leglabels]: ',' separated list of names for the legend ('!' for spaces, '*' for no label)
         [vartit]: name of the variable in the graph
         [title]: title of the plot ('|' for spaces)
@@ -2211 +2212 @@
         quit()
 
-    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[dimxyfmt]:[leglabels]:[vtit]:' + \
-      '[title]:[legvals]:[colns]:[lines]:[points]:[lwdths]:[psizes]:[freqv]:' +      \
+    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[dimxyfmt]:[vrange]:[leglabels]:'+\
+      '[vtit]:[title]:[legvals]:[colns]:[lines]:[points]:[lwdths]:[psizes]:[freqv]:'+\
       '[figname]:[graphk]:[close]'
     drw.check_arguments(fname,values,expectargs,':')
@@ -2219 +2220 @@
     dimvnames = values.split(':')[0]
     valuesaxis = values.split(':')[1]
-    dimtit = values.split(':')[2]
+    dimtit = values.split(':')[2].replace('|', ' ')
     dimxyfmt = values.split(':')[3]
-    leglabels = gen.latex_text(values.split(':')[4].replace('!',' '))
-    vartit = values.split(':')[5]
-    title = values.split(':')[6].replace('|',' ')
-    legvals = values.split(':')[7]
-    colns = gen.str_list(values.split(':')[8], ',')
-    lines = gen.str_list(values.split(':')[9], ',')
-    points = gen.str_list(values.split(':')[10], '@')
-    lwdths = gen.str_list_k(values.split(':')[11], ',', 'R')
-    psizes = gen.str_list_k(values.split(':')[12], ',', 'R')
-    freqv0 = values.split(':')[13]
-    figname = values.split(':')[14]
-    graphk = values.split(':')[15]
-    close = gen.Str_Bool(values.split(':')[16])
+    vrange = values.split(':')[4]
+    leglabels = gen.latex_text(values.split(':')[5].replace('!',' '))
+    vartit = values.split(':')[6]
+    title = values.split(':')[7].replace('|',' ')
+    legvals = values.split(':')[8]
+    colns = gen.str_list(values.split(':')[9], ',')
+    lines = gen.str_list(values.split(':')[10], ',')
+    points = gen.str_list(values.split(':')[11], '@')
+    lwdths = gen.str_list_k(values.split(':')[12], ',', 'R')
+    psizes = gen.str_list_k(values.split(':')[13], ',', 'R')
+    freqv0 = values.split(':')[14]
+    figname = values.split(':')[15]
+    graphk = values.split(':')[16]
+    close = gen.Str_Bool(values.split(':')[17])
 
     Nfiles = len(ncfiles)
@@ -2320 +2322 @@
     yaxis = [ystyl, yaxf, Nyax, yaxor]
 
-    drw.plot_lines(dimvalues, varvalues, valuesaxis, dimtit, xaxis, yaxis,           \
+    # range
+    if vrange == 'auto':
+        rng = None
+    else:
+        rng = np.array(vrange.split(','), dtype=np.float)
+
+    drw.plot_lines(dimvalues, varvalues, valuesaxis, dimtit, xaxis, yaxis, rng,      \
       leglabels.split(','), vartit, varunits, title, locleg, legfontsize, colns,     \
       lines, points, lwdths, psizes, freqv, figname, graphk, close)

trunk/tools/drawing_tools.py

@@ -5876 +5876 @@
     return
 
-def plot_lines(vardv, varvv, vaxis, dtit, xaxv, yaxv, linesn, vtit, vunit, gtit,     \
-  gloc, gsiz, cs, ls, ps, ws, ss, fv, fign, kfig, ifclose):
+def plot_lines(vardv, varvv, vaxis, dtit, xaxv, yaxv, vrange, linesn, vtit, vunit,   \
+  gtit, gloc, gsiz, cs, ls, ps, ws, ss, fv, fign, kfig, ifclose):
     """ Function to plot a collection of lines
       vardv= list of set of dimension values
@@ -5885 +5885 @@
       xaxv= list with the x-axis paramteres [style, format, number and orientation]
       yaxv= list with the y-axis paramteres [style, format, number and orientation]
-      linesn= names for the legend
+      vrange= range of values of the plot
+      linesn= names for the legend ('*' for no label)
       vtit= title for the vaxis
       vunit= units of the vaxis
@@ -5917 +5918 @@
     dxn = np.min(vardv)
     dxx = np.max(vardv)
-    dyn = np.min(varvv)
-    dyx = np.max(varvv)
+    if vrange is None:
+        dyn = np.min(varvv)
+        dyx = np.max(varvv)
+    else:
+        dyn = vrange[0]
+        dyx = vrange[1]
 
     if xaxv[0] == 'pretty':
@@ -5974 +5979 @@
     if vaxis == 'x':
         for il in range(Ntraj):
-            plt.plot(varvv[il], vardv[il], lins[il], marker=pts[il],                 \
-              linewidth=lws[il], markersize=pss[il], label= linesn[il], color=cols[il])
+            if linesn[il] == '*':
+                plt.plot(varvv[il], vardv[il], lins[il], marker=pts[il],             \
+                  linewidth=lws[il], markersize=pss[il], color=cols[il])
+            else:
+                plt.plot(varvv[il], vardv[il], lins[il], marker=pts[il],             \
+                  linewidth=lws[il], markersize=pss[il], label=linesn[il],           \
+                  color=cols[il])
 
         plt.xlim(dyn,dyx)
@@ -5982 +5992 @@
     else:
         for il in range(Ntraj):
-            plt.plot(vardv[il], varvv[il], lins[il], marker=pts[il],                 \
-              linewidth=lws[il], markersize=pss[il], label= linesn[il], color=cols[il])
+            if linesn[il] == '*':
+                plt.plot(vardv[il], varvv[il], lins[il], marker=pts[il],             \
+                  linewidth=lws[il], markersize=pss[il], color=cols[il])
+            else:
+                plt.plot(vardv[il], varvv[il], lins[il], marker=pts[il],             \
+                  linewidth=lws[il], markersize=pss[il], label=linesn[il],           \
+                  color=cols[il])
+
         
         plt.xlim(dxn,dxx)