Changeset 983 in lmdz_wrf

Timestamp:

Aug 9, 2016, 11:23:33 AM (8 years ago)

Author:

lfita

Message:

Adding color names, lines style, point styles, lines width, point sizes, frequency and name of the figure in `dar_lines'

File:

• trunk/tools/drawing.py (modified) (5 diffs)

trunk/tools/drawing.py

@@ -1664 +1664 @@
     draw_lines(ncfilens, values, varname):
       ncfilens= [filen] ',' separated list of netCDF files
-      values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[graphk]
+      values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[colns]:[lines]
+       [points]:[lwdths]:[psizes]:[freqv]:[figname][graphk]
         [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')
@@ -1675 +1676 @@
           5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
           9: 'upper center', 10: 'center'
+        [colns]= ',' list of color names ('None' for automatic, single value for all the same)
+        [lines]= ',' list of style of lines ('None' for automatic, single value for all the same)
+        [points]= ',' list of style of points ('None' for automatic, single value for all the same)
+        [lwdths]= ',' list of withs of lines ('None' for automatic, single value for all the same)
+        [psizes]= ',' list of size of points ('None' for automatic, single value for all the same)
+        [freqv]= frequency of values
+        [figname]= name of the figure
         [graphk]: kind of the graphic
       varname= variable to plot
@@ -1687 +1695 @@
         quit()
 
-    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[graphk]'
+    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:' +    \
+      '[locleg]:[colns]:[lines]:[points]:[lwdths]:[psizes]:[freqv]:[graphk]'
     drw.check_arguments(fname,values,expectargs,':')
 
@@ -1698 +1707 @@
     title = values.split(':')[5].replace('|',' ')
     locleg = values.split(':')[6]
-    graphk = values.split(':')[7]
+    colns = str_list(values.split(':')[7], ',')
+    lines = str_list(values.split(':')[8], ',')
+    points = str_list(values.split(':')[9], ',')
+    lwdths = str_list(values.split(':')[10], ',')
+    psizes = str_list(values.split(':')[11], ',')
+    freqv = values.split(':')[12]
+    figname = values.split(':')[13]
+    graphk = values.split(':')[14]
 
     Nfiles = len(ncfiles)
@@ -1773 +1789 @@
 
     drw.plot_lines(dimvalues, varvalues, valuesaxis, dimtit, leglabels.split(','),   \
-      vartit, varunits, title, locleg, graphk)
+      vartit, varunits, title, locleg, colns, lines, points, lwdths, psizes, freqv,  \
+      figname,graphk)
 
     return