Changeset 204 in lmdz_wrf for trunk/tools

Timestamp:

Dec 9, 2014, 5:30:58 PM (10 years ago)

Author:

lfita

Message:

Adding legend position in 'draw_lines_time'

Location:

trunk/tools

Files:

• drawing.py (modified) (5 diffs)
• drawing_tools.py (modified) (3 diffs)
• nc_var_tools.py (modified) (1 diff)

trunk/tools/drawing.py

@@ -1578 +1578 @@
     draw_lines_time(ncfilens, values, varname):
       ncfilens= [filen] ',' separated list of netCDF files
-      values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[timevals];[graphk]
+      values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[timevals];[locleg];[graphk]
         [dimvname]: name of the variable with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
@@ -1596 +1596 @@
                 'l': milisecond
            [tfmt]; desired format
+        [locleg]: location of the legend (-1, autmoatic)
+          1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
+          5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
+          9: 'upper center', 10: 'center'
         [graphk]: kind of the graphic
       varname= variable to plot
-      values= 'time;y;time ([DD]${[HH]}$);32x32;$wss^{*}$;wss Taylor's turbulence term;time|hours!since!1949-12-01_00:00:00;exct,12,h|%d$^{%H}$;pdf'
+      values= 'time;y;time ([DD]${[HH]}$);32x32;$wss^{*}$;wss Taylor's turbulence term;time|hours!since!1949-12-01_00:00:00;exct,12,h|%d$^{%H}$;2;pdf'
     """
 
@@ -1609 +1613 @@
 
     expectargs = '[dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];'
-    expectargs = expectargs + '[timevals];[graphk]'
+    expectargs = expectargs + '[timevals];[locleg];[graphk]'
     drw.check_arguments(fname,len(expectargs.split(';')),values,';',expectargs)
 
@@ -1620 +1624 @@
     title = values.split(';')[5].replace('|',' ')
     timevals = values.split(';')[6]
-    graphk = values.split(';')[7]
+    locleg = int(values.split(';')[7])
+    graphk = values.split(';')[8]
 
     Nfiles = len(ncfiles)
@@ -1702 +1707 @@
 
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, leglabels.split(','),   \
-      vartit, varunits, timepos, timelabels, title, graphk)
+      vartit, varunits, timepos, timelabels, title, locleg, graphk)
 
     return

trunk/tools/drawing_tools.py

@@ -4461 +4461 @@
 
 def plot_lines_time(vardv, varvv, vaxis, dtit, linesn, vtit, vunit, tpos, tlabs,     \
-  gtit, kfig):
+  gtit, gloc, kfig):
     """ Function to plot a collection of lines with a time axis
       vardv= list of set of dimension values
@@ -4473 +4473 @@
       tlabs= labels of the time ticks
       gtit= main title
+      gloc= location of the legend (-1, autmoatic)
+        1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
+        5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
+        9: 'upper center', 10: 'center'
       kfig= kind of figure
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
@@ -4525 +4529 @@
 
     plt.title(graphtit)
-    plt.legend()
+    plt.legend(loc=gloc)
     
     output_kind(kfig, figname, True)

trunk/tools/nc_var_tools.py

@@ -8461 +8461 @@
             newval = True
     elif vtype == '|S1':
-        newval = val
-    elif vtype == 'str':
-        print val, type(val)
-        newval = str(val)
+        newval = char(val)
     else:
         print errormsg