Changeset 1157 in lmdz_wrf

Timestamp:

Oct 7, 2016, 10:43:24 AM (9 years ago)

Author:

lfita

Message:

Adding use of:

latex_tex', legend_values', dimxyf', colorbarvalues' and `close'

Location:

trunk/tools

Files:

• drawing.py (modified) (43 diffs)
• drawing_tools.py (modified) (22 diffs)
• model_graphics.py (modified) (5 diffs)

trunk/tools/drawing.py

@@ -670 +670 @@
     draw_2D_shad_cont(ncfile, values, varn)
       ncfile= [ncfilevars],[ncfilevarc] files to use (one value, same file)
-      values=[vnamefs];[dimvals];[dimvalc];[dimxvn];[dimyvn];[colorbar];[ckind];[clabfmt];[sminv],[smaxv];[sminc],[smaxv],[Nlev];[figt];[kindfig];[reverse];[timevals]
+      values=[vnamefs];[dimvals];[dimvalc];[dimxvn];[dimyvn];[dimxyfmt];[colorbarvals];[ckind];[clabfmt];[sminv],[smaxv];[sminc],[smaxv],[Nlev];[figt];[kindfig];[reverse];[timevals];[close]
         [vnamefs],[vnamefc]: Name in the figure of the shaded and the contour variables
         [dimvals/c]: list of [dimname]|[value] telling at which dimension of the 
@@ -676 +676 @@
         [dimxvn]: name of the variables with the values of the dimension of the x-axis
         [dimyvn]: name of the variables with the values of the dimension of the y-axis
-        [colorbar]: name of the color bar
+        [dimxyfmt]=[dxf],[Ndx],[dyf],[Ndy]: format of the values at each axis
+          [dxs]: style of x-axis ('auto' for 'pretty')
+            'Nfix', values computed at even 'Ndx'
+            'Vfix', values computed at even 'Ndx' increments
+            'pretty', values computed following aprox. 'Ndx' at 'pretty' intervals (2.,2.5,4,5,10)
+          [dxf]: format of the labels at the x-axis
+          [Ndx]: Number of ticks at the x-axis
+          [ordx]: angle of orientation of ticks at the x-axis ('auto' for horizontal)
+          [dys]: style of y-axis ('auto' for 'pretty')
+          [dyf]: format of the labels at the y-axis
+          [Ndy]: Number of ticks at the y-axis
+          [ordy]: angle of orientation of ticks at the y-axis ('auto' for horizontal)
+        [colorbarvals]=[colbarn],[fmtcolorbar],[orientation]
+          [colorbarn]: name of the color bar
+          [fmtcolorbar]: format of the numbers in the color bar 'C'-like ('auto' for %6g)
+          [orientation]: orientation of the colorbar ('vertical' (default, by 'auto'), 'horizontal')
         [ckind]: kind of contours 
           'cmap': as it gets from colorbar
@@ -682 +697 @@
           'fixsigc,[colname]': fixed color [colname], >0 stright, <0 dashed  line
         [clabfmt]: format of the labels in the contour (None, also possible)
-        [smin/axv]: minimum and maximum value for the shading
+        [smin/axv]: minimum and maximum value for the shading or:
+          'Srange': for full range
+          'Saroundmean@val': for mean-xtrm,mean+xtrm where xtrm = np.min(mean-min@val,max@val-mean)
+          'Saroundminmax@val': for min*val,max*val
+          'Saroundpercentile@val': for median-xtrm,median+xtrm where xtrm = np.min(median-percentile_(val),
+            percentile_(100-val)-median)
+          'Smean@val': for -xtrm,xtrm where xtrm = np.min(mean-min*@val,max*@val-mean)
+          'Smedian@val': for -xtrm,xtrm where xtrm = np.min(median-min@val,max@val-median)
+          'Spercentile@val': for -xtrm,xtrm where xtrm = np.min(median-percentile_(val),
+             percentile_(100-val)-median)
         [sminc]:[smaxv]:[Nlev]: minimum, maximum and number of values for the contour
         [figt]: title of the figure ('|' for spaces)
@@ -690 +714 @@
           'flip',[x/y]: flip only the dimension [x] or [y]
         [timevals]: [timen]|[units]|[kind]|[tfmt]|[label] time labels characteristics
-           [timen]; name of the time variable
-           [units]; units string according to CF conventions ([tunits] since 
-             [YYYY]-[MM]-[DD] [[HH]:[MI]:[SS]], '!' for spaces)
-           [kind]; kind of output
-             'Nval': according to a given number of values as 'Nval',[Nval]
-             'exct': according to an exact time unit as 'exct',[tunit]; 
-               tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
-                'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
-                'l': milisecond
-           [tfmt]; desired format
-           [label]; label at the graph ('!' for spaces)
+          [timen]; name of the time variable
+          [units]; units string according to CF conventions ([tunits] since 
+            [YYYY]-[MM]-[DD] [[HH]:[MI]:[SS]], '!' for spaces)
+          [kind]; kind of output
+            'Nval': according to a given number of values as 'Nval',[Nval]
+            'exct': according to an exact time unit as 'exct',[tunit]; 
+              tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
+               'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
+               'l': milisecond
+          [tfmt]; desired format
+          [label]; label at the graph ('!' for spaces)
+        [close]: Whether figure should be finished or not
       valules= 'rh,ta;z|-1,x|-1;z|-1,x|-1;lat;pressure;BuPu;fixsigc,black;%d;0.,100.;195.,305.,7;Meridonal|average|of|rh|&|ta;pdf;flip@y;time!hours!since!1949/12/01|exct,5d|%d|date!([DD])' 
       varn= [varsn],[varcn] name of the variable to plot with shading variable with contour
@@ -711 +736 @@
         quit()
 
-    expectargs = '[vnamefs];[dimvals];[dimvalc];[dimxvn];[dimyvn];[colorbar];' +     \
-      '[ckind];[clabfmt];[sminv],[smaxv];[sminc],[smaxv],[Nlev];[figt];[kindfig];' + \
-      '[reverse];[timevals]'
+    expectargs = '[vnamefs];[dimvals];[dimvalc];[dimxvn];[dimyvn];[dimxyfmt];' +     \
+      '[colorbarvals];[ckind];[clabfmt];[sminv],[smaxv];[sminc],[smaxv],[Nlev];' +   \
+      '[figt];[kindfig];[reverse];[timevals];[close]'
  
     drw.check_arguments(fname,values,expectargs,';')
@@ -722 +747 @@
     vdimxn = values.split(';')[3]
     vdimyn = values.split(';')[4]
-    colbarn = values.split(';')[5]
-    countkind = values.split(';')[6]
-    countlabelfmt = values.split(';')[7]
-    shadminmax = values.split(';')[8]
-    contlevels = values.split(';')[9]
-    figtitle = values.split(';')[10].replace('|',' ')
-    figkind = values.split(';')[11]
-    revals = values.split(';')[12]
-    timevals = values.split(';')[13]
+    dimxyfmt = values.split(';')[5]
+    colbarvals = values.split(';')[6]
+    countkind = values.split(';')[7]
+    countlabelfmt = values.split(';')[8]
+    shadminmax = values.split(';')[9]
+    contlevels = values.split(';')[10]
+    figtitle = values.split(';')[11].replace('|',' ')
+    figkind = values.split(';')[12]
+    revals = values.split(';')[13]
+    timevals = values.split(';')[14]
+    close = gen.Str_Bool(values.split(';')[15])
 
     if2filenames = ncfile.find(',')
@@ -852 +879 @@
         countlfmt = countlabelfmt
 
-    shading_nx = np.zeros((2), dtype=np.float)
-    shading_nx[0] = np.float(shadminmax.split(',')[0])
-    shading_nx[1] = np.float(shadminmax.split(',')[1])
+    shading_nx = []
+    if shadminmax.split(',')[0][0:1] != 'S':
+            shading_nx.append(np.float(shadminmax.split(',')[0]))
+    else:
+        shading_nx.append(shadminmax.split(',')[0])
+
+    if shadminmax.split(',')[1][0:1] != 'S':
+        shading_nx.append(np.float(shadminmax.split(',')[1]))
+    else:
+        shading_nx.append(shadminmax.split(',')[1])
 
     clevmin = np.float(contlevels.split(',')[0])
@@ -870 +904 @@
         print '    generating default ones: ',levels_cont
 
+    colbarn, fmtcolbar, colbaror = drw.colorbar_vals(colorbarvals,',')
+
+    xstyl, xaxf, Nxax, xaxor, ystyl, yaxf, Nyax, yaxor = drw.format_axes(dimxyf,',')
+    xaxis = [xstyl, xaxf, Nxax, xaxor]
+    yaxis = [ystyl, yaxf, Nyax, yaxor]
+
     if revals == 'None': revals = None
 
     drw.plot_2D_shadow_contour_time(valshad, valcont, vnamesfig, ovalaxisv,         \
-      timevals, timepos, timelabels, ovalu, timelabel, dimt, dimnamesv, colbarn,    \
-      countkind, countlfmt, shading_nx, levels_cont, varunits, figtitle, figkind,   \
-      revals)
+      timevals, timepos, timelabels, ovalu, timelabel, dimt, xaxis, yaxis,          \
+      dimnamesv, colbarn, fmtcolbar, colbaror, countkind, countlfmt, shading_nx,    \
+      levels_cont, varunits, figtitle, figkind, revals, close)
 
     return
@@ -1429 +1469 @@
     draw_topo_geogrid_boxes(ncfile, values)
       ncfiles= ',' list of geo_em.d[nn].nc files to use (fisrt as topographyc reference)
-      values= [minTopo],[maxTopo]:[lonlatL]:[title]:[graphic_kind]:[mapvalues]:[labels]:[legloc]
+      values= [minTopo],[maxTopo]:[lonlatL]:[title]:[graphic_kind]:[mapvalues]:[labels]:[legvals]
         [min/max]Topo: minimum and maximum values of topography to draw
         lonlatL: limits of longitudes and latitudes [lonmin, latmin, lonmax, latmax] or None
@@ -1445 +1485 @@
             * 'h', high
             * 'f', full
-        legloc= location of the legend (0, 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'
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         labels= labels to write in the graph
     """
@@ -1711 +1753 @@
     draw_lines(ncfilens, values, varname):
       ncfilens= [filen] ',' separated list of netCDF files
-      values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[colns]:[lines]
-       [points]:[lwdths]:[psizes]:[freqv]:[figname]:[graphk]
+      values= [dimvname]:[valuesaxis]:[dimtit]:[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')
@@ -1719 +1761 @@
         [vartit]: name of the variable in the graph
         [title]: title of the plot ('|' for spaces)
-        [locleg]: location of the legend (0, 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'
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         [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)
@@ -1731 +1775 @@
         [figname]= name of the figure
         [graphk]: kind of the graphic
+        [close]: should figure be closed (finished)
       varname= variable to plot
       values= 'XLAT:x:latitude:32x32:$wss^{*}$:wss Taylor's turbulence term:pdf'
@@ -1743 +1788 @@
 
     expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:' +    \
-      '[locleg]:[colns]:[lines]:[points]:[lwdths]:[psizes]:[freqv]:[figname]:[graphk]'
+      '[legvals]:[colns]:[lines]:[points]:[lwdths]:[psizes]:[freqv]:[figname]:' +    \
+      '[graphk]:[close]'
     drw.check_arguments(fname,values,expectargs,':')
 
@@ -1753 +1799 @@
     vartit = values.split(':')[4]
     title = values.split(':')[5].replace('|',' ')
-    locleg = int(values.split(':')[6])
+    legvals = values.split(':')[6]
     colns = gen.str_list(values.split(':')[7], ',')
     lines = gen.str_list(values.split(':')[8], ',')
@@ -1762 +1808 @@
     figname = values.split(':')[13]
     graphk = values.split(':')[14]
+    close = gen.Str_Bool(values.split(':')[15])
 
     Nfiles = len(ncfiles)
@@ -1840 +1887 @@
         freqv = int(freqv0)
 
+    # Legend
+    locleg, legfontsize = drw.legend_values(legvals,'|')
+
     drw.plot_lines(dimvalues, varvalues, valuesaxis, dimtit, leglabels.split(','),   \
-      vartit, varunits, title, locleg, colns, lines, points, lwdths, psizes, freqv,  \
-      figname,graphk)
+      vartit, varunits, title, locleg, legfontsize, colns, lines, points, lwdths,    \
+      psizes, freqv, figname, graphk, close)
 
     return
@@ -1851 +1901 @@
       ncfilens= [filen] ',' separated list of netCDF files
       values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[rangevals];[timevals];
-        [legvals];[graphk];[collines];[points];[linewidths];[pointsizes];[pointfreq];[period]
+        [legvals];[graphk];[collines];[points];[linewidths];[pointsizes];[pointfreq];[period];[close]
         [dimvname]: ',' list of names of the variables with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
@@ -1892 +1942 @@
           '-1': all period
           [beg],[end]: beginning and end of the period in reference time-units of first file
+        [close]: Whether figure should be finished or not
       varname0= ',' list of variable names to plot (assuming only 1 variable per file)
       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'
@@ -1906 +1957 @@
     expectargs = expectargs + '[rangevals];[timevals];[legvals];[graphk];[lines];'
     expectargs = expectargs + '[collines];[points];[linewidths];[pointsizes];'
-    expectargs = expectargs + '[pointfreq];[period]'
+    expectargs = expectargs + '[pointfreq];[period];[close]'
     drw.check_arguments(fname,values,expectargs,';')
 
@@ -1918 +1969 @@
     rangevals = values.split(';')[6]
     timevals = values.split(';')[7]
-    legvalues = values.split(';')[8]
+    legvals = values.split(';')[8]
     graphk = values.split(';')[9]
     lines0 = values.split(';')[10]
@@ -1927 +1978 @@
     pointfreq0 = values.split(';')[15]
     period = values.split(';')[16]
+    close = gen.Str_Bool(values.split(':')[17])
 
     Nfiles = len(ncfiles)
@@ -2013 +2065 @@
         if valmax != 'auto': valmax = np.float(valmax)
 
-    locleg = int(legvalues.split('|')[0])
-    if legvalues.split('|')[1] == 'auto':
-        legfontsize = 12
-    else:
-        legfontsize = int(legvalues.split('|')[1])
+    # Legend
+    locleg, legfontsize = drw.legend_values(legvals,'|')
 
 # Getting values
@@ -2186 +2235 @@
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, legvals, vartit,   \
       varunits, timepos, timelabels, title, locleg, legfontsize, graphk, valmin,     \
-      valmax, lines, collines, points, linewidths, pointsizes, pointfreq)
+      valmax, lines, collines, points, linewidths, pointsizes, pointfreq, close)
 
     return
@@ -2415 +2464 @@
     """ Function to plot a series of points
       [values]= [ptasciifile]:[gtit]:[mapvalues]:[kindfigure]:[pointcolor]:[pointlabels]:
-        [locleg]:[figureko]:[figuren]
+        [legvals]:[figureko]:[figuren]
         [ptasciifile]:[file],[comchar],[collon],[collat],[lab]
           [file]: column ASCII file with the location of the points
@@ -2439 +2488 @@
         [pointcolor]: color for the points ('auto' for "red")
         [pointlabels]: ',' of labels [only used if [collab]='None'] ('None' for no labels)
-        [locleg]: location of the legend (0, 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'
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         [figureko]: kind of the output file (pdf, png, ...)
         [figuren]: name of the figure
@@ -2579 +2630 @@
 def draw_points_lonlat(filen, values):
     """ Function to plot a series of lon/lat points
-     filen= name of the file
-     values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[ptsize]:[labels]:[locleg]:[figureK]
-       [lonvarname]: name of the variable longitude
-       [latvarname]: name of the variable latitude
-       [gkind]: kind of graphical output
-       [gtit]: graphic title '!' for spaces
-       [ptcolor]: color of the points ('auto', for "red")
-       [pttype]: type of point
-       [ptsize]: size of point
-       [labels]: ',' list of labels to use
-       [locleg]: location of the legend (0, automatic)
-         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'
-       [figureK]= kind of figure
-         'legend': only points in the map with the legend with the names
-         'labelled',[txtsize],[txtcol]: points with the names and size, color of text
+      filen= name of the file
+      values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[ptsize]:[labels]:[legvals]:[figureK]
+        [lonvarname]: name of the variable longitude
+        [latvarname]: name of the variable latitude
+        [gkind]: kind of graphical output
+        [gtit]: graphic title '!' for spaces
+        [ptcolor]: color of the points ('auto', for "red")
+        [pttype]: type of point
+        [ptsize]: size of point
+        [labels]: ',' list of labels to use
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
+        [figureK]= kind of figure
+          'legend': only points in the map with the legend with the names
+          'labelled',[txtsize],[txtcol]: points with the names and size, color of text
     """
     fname = 'draw_points_lonlat'
@@ -2685 +2738 @@
 def draw_timeSeries(filen, values, variables):
     """ Function to draw a time-series
-    draw_timeSeries(filen, values, variable):
-      filen= name of the file
-      values= [gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[locleg]:[gkind]:[colorlines]:[pointtype]:[pointfreq]
-      [gvarname]: name of the variable to appear in the graph
-      [timetit]: title of the time axis (assumed x-axis, '|' for spaces)
-      [tkind]: kind of time to appear in the graph (assumed x-axis)
-        'Nval': according to a given number of values as 'Nval',[Nval]
-        'exct': according to an exact time unit as 'exct',[tunit]; 
-          tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
-            'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
-            'l': milisecond
-      [timefmt]: format of the time labels
-      [title]: title of the graphic ('|' for spaces)
-      [locleg]: location of the legend (0, automatic)
-        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'
-      [gkind]: kind of graphical output
-      [colorlines]: ',' list of colors for the lines, None for automatic, single
+      draw_timeSeries(filen, values, variable):
+        filen= name of the file
+        values= [gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[legvals]:[gkind]:[colorlines]:[pointtype]:[pointfreq]
+        [gvarname]: name of the variable to appear in the graph
+        [timetit]: title of the time axis (assumed x-axis, '|' for spaces)
+        [tkind]: kind of time to appear in the graph (assumed x-axis)
+          'Nval': according to a given number of values as 'Nval',[Nval]
+          'exct': according to an exact time unit as 'exct',[tunit]; 
+            tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
+              'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
+              'l': milisecond
+        [timefmt]: format of the time labels
+        [title]: title of the graphic ('|' for spaces)
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
+        [gkind]: kind of graphical output
+        [colorlines]: ',' list of colors for the lines, None for automatic, single
           value all the same
-      [pointtype]: ',' list of type of points for the lines, None for automatic, single
+        [pointtype]: ',' list of type of points for the lines, None for automatic, single
           value all the same
-      [pointfreq]: frequency of point plotting, 'all' for all time steps
+        [pointfreq]: frequency of point plotting, 'all' for all time steps
       variables= [varname],[timename] names of variable and variable with times
       draw_timeSeries('wrfout_d01_1979-12-01_00:00:00_bottom_top_B6-E6-I1_south_north_B3-E3-I1_west_east_B26-E26-I1.nc', 'dt_con:time|($[DD]^{[HH]}$):exct,12,h:$%d^{%H}$:time|evolution|at|-1|6|3|26:1:pdf', 'LDQCON,time')
@@ -2974 +3029 @@
 def draw_vals_trajectories(ncfile, values, variable):
     """ Function to draw values from the outputs from 'compute_tevolboxtraj'
-    draw_vals_trajectories(ncfile, values, variable)
-    ncfile= [ncfile] ',' list of files to use
-    values= [statisticskind]:[Tint]:[labels]@[locleg]:[gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[gkind]
-      [statisticskind]=[statistics][kind]
-        [statistics]: which statistics to use, from: 'center', 'min', 'max', 'mean', 
-        'mean2', 'stdev'
-        [kind]: 'box', 'circle' statistics taking the values from a box or a circle
-        'trj': value following the trajectory
-      [Tint]: [Tbeg]@[Tend] or None, interval of time to plot or -1 for all the times
-      [labels]: ',' separated list of labels for the legend
-      [locleg]: location of the legend (0, automatic)
-        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'
-      [gvarname]: name of the variable to appear in the graph
-      [timetit]: title of the time axis (assumed x-axis, '|' for spaces)
-      [tkind]: kind of time to appear in the graph (assumed x-axis)
-        'Nval': according to a given number of values as 'Nval',[Nval]
-        'exct': according to an exact time unit as 'exct',[tunit]; 
-          tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
-            'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
-            'l': milisecond
-      [timefmt]: format of the time labels
-      [title]: title of the graphic ('|' for spaces)
-      [gkind]: kind of graphical output
-    variable= variable to use
+      draw_vals_trajectories(ncfile, values, variable)
+      ncfile= [ncfile] ',' list of files to use
+      values= [statisticskind]:[Tint]:[labels]@[legvals]:[gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[gkind]
+        [statisticskind]=[statistics][kind]
+          [statistics]: which statistics to use, from: 'center', 'min', 'max', 'mean', 
+            'mean2', 'stdev'
+          [kind]: 'box', 'circle' statistics taking the values from a box or a circle
+            'trj': value following the trajectory
+        [Tint]: [Tbeg]@[Tend] or None, interval of time to plot or -1 for all the times
+        [labels]: ',' separated list of labels for the legend
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
+        [gvarname]: name of the variable to appear in the graph
+        [timetit]: title of the time axis (assumed x-axis, '|' for spaces)
+        [tkind]: kind of time to appear in the graph (assumed x-axis)
+          'Nval': according to a given number of values as 'Nval',[Nval]
+          'exct': according to an exact time unit as 'exct',[tunit]; 
+            tunit= [Nunits],[tu]; [tu]= 'c': centuries, 'y': year, 'm': month,
+              'w': week, 'd': day, 'h': hour, 'i': minute, 's': second, 
+                'l': milisecond
+        [timefmt]: format of the time labels
+        [title]: title of the graphic ('|' for spaces)
+        [gkind]: kind of graphical output
+      variable= variable to use
     """
-
     fname = 'draw_vals_trajectories'
 
@@ -3671 +3727 @@
     """ Function to plot rivers' description from ORCHIDEE's routing scheme
       values= [dimname]|[vardimname]|[value]:[basinvals]:[upstreamvals]:[mapvalues]:
-        [gtit]:[kindfig]:[legloc]:[figuren]
+        [gtit]:[kindfig]:[legvals]:[figuren]
         'X/Y'|[dimname]|[vardimname]|[value]: ',', list for each basic dimension '|' separated of:
           [dimname]: name of the dimension in the file
@@ -3694 +3750 @@
         gtit= title of the graph ('|', for spaces)
         kindfig= kind of figure
-        legloc= location of the legend (0, automatic)
-          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
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         figuren= name of the figure
       ncfile= file to use
@@ -3849 +3907 @@
     draw_topo_geogrid(ncfile, values, varn)
       ncfile= file to use
-      values= [zlogs]:[plogs]:[title]:[graphic_kind]:[legloc]
+      values= [zlogs]:[plogs]:[title]:[graphic_kind]:[legvals]
         zlogs= zlog,dzlog
         zlog: to use logarithmic scale on the height axis ('true/false')
@@ -3858 +3916 @@
         title: title of the graph ('!' for spaces)
         graphic_kind: kind of figure (jpg, pdf, png)
-        legloc= location of the legend (0, automatic)
-          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
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
       varn= [varnheight],[varnpres]
         varnheight: name of the variable with the height of the vertical levels
@@ -4055 +4115 @@
     """ Function to plot subbasin from 'routnig.nc' ORCDHIEE
       ncfile= file to use produced with nc_var.py#subbasin function 
-      values= [subasiname]:[rangecolors]:[mapv]:[basinlinewidth]:[drawsubid]:[gtit]:[figkind]:[legloc]:[figurename]
+      values= [subasiname]:[rangecolors]:[mapv]:[basinlinewidth]:[drawsubid]:[gtit]:[figkind]:[legvals]:[figurename]
         [subasiname]= name of the subbasin ('!' for spaces)
         [rcolor]= '@', list of 'r|g|b' 1-based colors (as much as first level sub-flow). 'None' for automatic
@@ -4072 +4132 @@
         [drawsubid]= wehther sub-flow ids should be plot or not
         [graphtit]= title of the graph ('|', for spaces)
-        [lloc]= location of the legend (0, automatic)
-          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
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         [figname]= name of the figure
     """
@@ -4165 +4227 @@
     """ Fucntion to plot two lines in different axes (x/x2 or y/y2)
       values= [commonvardim]:[varangeA]:[varangeB]:[varangeaxis]:[axisvals]:[figvarns]:[colors]:
-       [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[lloc]:[figname]:[figkind]
+       [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[legvals]:[figname]:[figkind]
         [commonvardim]: name of the common variable-dimension
         [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic; 'Extrs' from values extremes)
@@ -4180 +4242 @@
         [graphtitle]: title of the figure ('!' for spaces)
         [labelaxis]: label in the figure of the common axis ('!' for spaces)
-        [lloc]: location of the legend (0, automatic)
-          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
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         [figname]: name of the figure
         [figkind]: kind of figure
@@ -4215 +4279 @@
     graphtitle = values.split(':')[11].replace('!',' ')
     labelaxis = values.split(':')[12].replace('!',' ')
-    lloc = np.int(values.split(':')[13])
+    legvals = values.split(':')[13]
     figname = values.split(':')[14]
     figkind = values.split(':')[15]
@@ -4327 +4391 @@
       2, colors, styles, marks, widths, sizemarks, 'None')
 
+    # legend
+    lloc, lsize = legend_values(legvals,'|')
+
     drw.plot_2lines(varvalsA, varvalsB, varvalsaxisA, varvalsaxisB, varangeA,        \
       varangeB, varangeaxis, axisvals, figvarns, varunits, colvalues, lwidths,       \
-      linekinds, psizes, pointkinds, graphtitle, labelaxis, lloc, figname, figkind)
+      linekinds, psizes, pointkinds, graphtitle, labelaxis, lloc, lsize, figname,    \
+      figkind)
 
 
@@ -4335 +4403 @@
     """ Function to plot two time-lines in different axes (x/x2 or y/y2)
       values= [timevardim]:[varangeA]:[varangeB]:[timeaxisfmt]:[timeaxis]:[figvarns]:[colors]:
-       [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[lloc]:[figname]:[figkind]
+       [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[legvals]:[figname]:[figkind]
         [timevardim]: name of the common variable-dimension time
         [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic; 'Extrs' from values extremes)
@@ -4356 +4424 @@
         [graphtitle]: title of the figure ('!' for spaces)
         [labelaxis]: label in the figure of the common axis ('!' for spaces)
-        [lloc]: location of the legend (0, automatic)
-          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
+        [legvals]=[locleg]|[fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
         [figname]: name of the figure
         [figkind]: kind of figure
@@ -4391 +4461 @@
     graphtitle = values.split(':')[11].replace('!',' ')
     labelaxis = values.split(':')[12].replace('!',' ')
-    lloc = np.int(values.split(':')[13])
+    legvals = values.split(':')[13]
     figname = values.split(':')[14]
     figkind = values.split(':')[15]
@@ -4502 +4572 @@
       2, colors, styles, marks, widths, sizemarks, 'None')
 
+    # legend
+    lloc, lsize = legend_values(legvals,'|')
+
     drw.plot_2lines_time(varvalsA, varvalsB, timevalsA, varvalsaxisB, varangeA,      \
       varangeB, tpos, tlabels, timeaxis, figvarns, varunits, colvalues, lwidths,     \
-      linekinds, psizes, pointkinds, graphtitle, labelaxis, lloc, figname, figkind)
+      linekinds, psizes, pointkinds, graphtitle, labelaxis, lloc, lsize, figname,    \
+      figkind)
 
 #quit()

trunk/tools/drawing_tools.py

@@ -32 +32 @@
 # format_axes: Function to provide the format for the ticks of the axes in a figure
 # graphic_range: Function to provide the ranges of a figure following different options
+# legend_values: Function to determine the values for the legend
 # searchInlist:
 # datetimeStr_datetime:
@@ -1696 +1697 @@
 #quit()
 
-
+def legend_values(legstring, char):
+    """ Function to determine the values for the legend
+      legstring= char separated list of [locleg][char][fontsize]: 
+          [locleg]: location of the legend (0, 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'
+          [fontsize]: font size for the legend (auto for 12)
+      char= separation character
+    """
+    fname = 'legend_values'
+
+    locleg = int(legstring.split('|')[0])
+    fontsize0 = legstring.split('|')[1]
+    if fontsize0 == 'auto':
+        fontsize = 12
+    else:
+        fontsize = int(fontsize0)
+
+    return locleg, fontsize
 
 #######    #######    #######    #######    #######    #######    #######    #######    #######    #######
@@ -4973 +4993 @@
     return
 
-def plot_2D_shadow_contour_time(varsv,varcv,vnames,valv,timv,timpos,timlab,valu,     \
-  timeu,axist,dimn,colorbar,ckind,clabfmt,vs,vc,uts,vtit,kfig,reva):
+def plot_2D_shadow_contour_time(varsv, varcv, vnames, valv, timv, timpos, timlab,    \
+  valu, timeu, axist, xaxv, yaxv, dimn, colorbar, cbarfmt, cbaror, ckind, clabfmt,   \
+  vs, vc, uts, vtit, kfig, reva, ifclose):
     """ Adding labels and other staff to the graph
       varsv= 2D values to plot with shading
@@ -4986 +5007 @@
       timeu = units at the axes which is time
       axist = which is the axis time
+      xaxv= list with the x-axis paramteres [style, format, number and orientation]
+      yaxv= list with the y-axis paramteres [style, format, number and orientation]
       dimn= dimension names to plot
       colorbar= name of the color bar to use
+      cbarfmt= format of the numbers in the colorbar
+      cbaror= orientation of the colorbar
       ckind= contour kind
         'cmap': as it gets from colorbar
@@ -5001 +5026 @@
         * 'transpose': reverse the axes (x-->y, y-->x)
         * 'flip'@[x/y]: flip the axis x or y
+      ifclose= boolean value whether figure should be close (finish) or not
     """
 ##    import matplotlib as mpl
@@ -5012 +5038 @@
         quit()
 
+    # Check variable consistency
+    if len(varsv.shape) != 2:
+        print errormsg
+        print '  ' + fname + ': wrong variable shape:',varsv.shape,'is has to be 2D!!'
+        quit(-1)
+    if len(varcv.shape) != 2:
+        print errormsg
+        print '  ' + fname + ': wrong variable contour:',varcv.shape,'is has to be 2D!!'
+        quit(-1)
+
+    # Axis ticks
     # Usually axis > x must be the time, thus...
-    if axist == 'x':
-        dimxv0 = valv.copy()
-        dimyv0 = timv.copy()
-        dimxt0 = np.array(pretty_int(valv.min(),valv.max(),10))
-        dimyt0 = np.array(timpos)
-        dimxl0 = []
-        for i in range(len(dimxt0)): dimxl0.append(str(dimxt0[i]))
-        dimyl0 = list(timlab)
-        dimxT0 = variables_values(dimn[1])[0] + ' (' + units_lunits(valu) + ')'
-        dimyT0 = timeu
-    else:
-        dimxv0 = timv.copy()
-        dimyv0 = valv.copy()
-        dimxt0 = np.array(timpos)
-        dimyt0 = np.array(pretty_int(valv.min(),valv.max(),10))
-        dimxl0 = list(timlab)
-        dimyl0 = []
-        for i in range(len(dimyt0)): dimyl0.append(str(dimyt0[i]))
-        dimxT0 = timeu
-        dimyT0 = variables_values(dimn[0])[0] + ' (' + units_lunits(valu) + ')'
-
-    if axist == 'x':
-        reva = 'transpose'
+    dimxv0 = timv.copy()
+    dimyv0 = valv.copy()
+
+    dxn = dimxv0.min()
+    dxx = dimxv0.max()
+    dyn = dimyv0.min()
+    dyx = dimyv0.max()
+
+    # Time ticks-labels are already given from another function
+    dimxt0 = np.array(timpos)
+    if yaxv[0] == 'pretty':
+        dimyt0 = np.array(pretty_int(dyn,dyx,yaxv[2]))
+    elif yaxv[0] == 'Nfix':
+        dimyt0 = np.arange(dyn,dyx,(dyx-dyn)/(1.*yaxv[2]))
+    elif yaxv[0] == 'Vfix':
+        dimyt0 = np.arange(0,dyx,yaxv[2])
+
+    dimxl0 = list(timlab)
+    dimyl0 = []
+    for i in range(len(dimyt0)): dimyl0.append('{:{style}}'.format(dimyt0[i], style=yaxv[1]))
+
+    dimxT0 = timeu
+    dimyT0 = variables_values(dimn[1])[0] + ' (' + units_lunits(dimyu) + ')'
+
+    # Variable values will have time variable as 0 dimension
+    reva = 'transpose'
+
+    if axist == 'y':
+        valx0 = dimyv0
+        valy0 = dimxv0
+        dimxv0 = valx0
+        dimyv0 = valy0
+
+        valx1 = dimyt0
+        valy1 = dimxt0
+        dimxt0 = valx1
+        dimyt0 = valy1
+
+        valx2 = dimyl0
+        valy2 = dimxl0
+        dimxl0 = valx2
+        dimyl0 = valy2
+
+        valx3 = dimyT0
+        valy3 = dimxT0
+        dimxT0 = valx3
+        dimyT0 = valy3
+
+        reva = None
 
     if reva is not None:
@@ -5056 +5119 @@
     dy=varsv.shape[0]
 
-    x,y = gen.lonlat2D(dimxv,dimyv)
+    # No following data values
+    #    x,y = gen.lonlat2D(dimxv,dimyv)
+    x = (dimxv-np.min(dimxv))/(np.max(dimxv) - np.min(dimxv))
+    y = (dimyv-np.min(dimyv))/(np.max(dimyv) - np.min(dimyv))
 
     plt.rc('text', usetex=True)
 
-    plt.xticks(dimxt, dimxl)
-    plt.yticks(dimyt, dimyl)
+    plt.xticks(dimxt, dimxl, rotation=xaxv[3])
+    plt.yticks(dimyt, dimyl, rotation=yaxv[3])
 
     plt.xlim(0,dx)
@@ -5067 +5133 @@
 
     plt.pcolormesh(x, y, varsv, cmap=plt.get_cmap(colorbar), vmin=vs[0], vmax=vs[1])
-    cbar = plt.colorbar()
+    if cbaror == 'horizontal':
+        cbar = plt.colorbar(format=cbarfmt,orientation=cbaror)
+        # From: http://stackoverflow.com/questions/32050030/rotation-of-colorbar-tick-labels-in-matplotlib
+        ticklabels= cbar.ax.get_xticklabels()
+        Nticks = len(ticklabels)
+        ticklabs = []
+        for itick in range(Nticks): ticklabs.append(ticklabels[itick].get_text())
+        cbar.ax.set_xticklabels(ticklabs,rotation=90)
+    else:
+        cbar = plt.colorbar(format=cbarfmt,orientation=cbaror)
     
 # contour
@@ -5101 +5176 @@
 
 # units labels
-    cbar.set_label(vnames[0].replace('_','\_') + ' (' + units_lunits(uts[0]) + ')')
-    plt.annotate(vnames[1].replace('_','\_') +' (' + units_lunits(uts[1]) + ') [' +  \
+    cbar.set_label(gen.latex_text(vnames[0]) + ' (' + units_lunits(uts[0]) + ')')
+    plt.annotate(gen.latex_text(vnames[1]) +' (' + units_lunits(uts[1]) + ') [' +    \
       mincntS + ', ' + maxcntS + ']', xy=(0.55,0.04), xycoords='figure fraction',    \
       color=coln)
 
     figname = '2Dfields_shadow-contour'
-    graphtit = vtit.replace('_','\_').replace('&','\&')
+    graphtit = gen.latex_text(vtit)
 
     plt.title(graphtit)
     
-    output_kind(kfig, figname, True)
+    output_kind(kfig, figname, ifclose)
 
     return
@@ -5732 +5807 @@
     return
 
-def plot_lines(vardv, varvv, vaxis, dtit, linesn, vtit, vunit, gtit, gloc, cs, ls,   \
-  ps, ws, ss, fv, fign, kfig):
+def plot_lines(vardv, varvv, vaxis, dtit, 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
@@ -5747 +5822 @@
         5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
         9: 'upper center', 10: 'center'
+      gsiz= fontsize of the legend
       cs= list of color names
       ls= list of style of lines
@@ -5755 +5831 @@
       fign= name of the figure
       kfig= kind of figure
+      ifclose= boolean value whether figure should be close (finish) or not
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
   ['2.5'], 'sin', '-', 'sinus frequency dependency', 'sinus', 'pdf')
@@ -5811 +5888 @@
 
     plt.title(graphtit)
-    plt.legend(loc=gloc)
+    plt.legend(loc=gloc, fontsize=gsiz)
     
-    output_kind(kfig, fign, True)
+    output_kind(kfig, fign, ifclose)
 
     return
@@ -6055 +6132 @@
 
 def plot_lines_time(vardv, varvv, vaxis, dtit, linesn0, vtit, vunit, tpos, tlabs,    \
-  gtit, gloc, gsize, kfig, vmin, vmax, lsl, coll, ptl, lwidth, psize, ptf):
+  gtit, gloc, gsize, kfig, vmin, vmax, lsl, coll, ptl, lwidth, psize, ptf, ifclose):
     """ Function to plot a collection of lines with a time axis
       vardv= list of set of dimension values
@@ -6083 +6160 @@
       psize= ',' list of point sizes
       ptf= frequency of point plotting, 'all' for all time steps
+      ifclose= boolean value whether figure should be close (finish) or not
 
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
@@ -6218 +6296 @@
     print plt.xlim(),':', plt.ylim()
     
-    output_kind(kfig, figname, True)
+    output_kind(kfig, figname, ifclose)
 
     return
@@ -7518 +7596 @@
 def plot_2lines(valsA, valsB, valsaxisA, valsaxisB, rangeA, rangeB, rangeaxis,       \
   axisvals, varns, varus, cols, wdths, styls, szmks, marks, gtitle, axisn, gloc,     \
-  fign, figk):
+  sloc, fign, figk):
     """ Function to plot two lines in different axes (x/x2 or y/y2)
       valsA= values to be plotted on axis x or y
@@ -7538 +7616 @@
       axisn= label in the figure of the common axis
       gloc= location of the legend
+      gsiz= fontsize of the legend
       fign= name of the figure
       figk= kind of figure
@@ -7607 +7686 @@
         titleloc = (0.5,1.075)
         
-    graphtit = gtitle.replace('_','\_').replace('&','\&')
+    graphtit = gen.latex_text(gtitle)
 
     plt.title(graphtit,position=titleloc)
-    # plt.legend([lA, lB], loc=gloc)
+    # plt.legend([lA, lB], loc=gloc, fontsize=gsiz)
     
     output_kind(figk, fign, True)
@@ -7616 +7695 @@
     return
 
-
 def plot_2lines_time(valsA, valsB, valsaxisA, valsaxisB, rangeA, rangeB, valstaxis,  \
   labelstaxis, taxis, varns, varus, cols, wdths, styls, szmks, marks, gtitle, axisn, \
-  gloc, fign, figk):
+  gloc, gsize, fign, figk):
     """ Function to plot two time-lines in different axes (x/x2 or y/y2)
       valsA= values to be plotted on axis x or y
@@ -7640 +7718 @@
       axisn= label in the figure of the time axis
       gloc= location of the legend
+      gsiz= fontsize of the legend
       fign= name of the figure
       figk= kind of figure
@@ -7714 +7793 @@
         titleloc = (0.5,1.075)
         
-#    graphtit = gtitle.replace('_','\_').replace('&','\&')
     graphtit = gen.latex_text(gtitle)
 
     plt.title(graphtit,position=titleloc)
-    # plt.legend([lA, lB], loc=gloc)
+    # plt.legend([lA, lB], loc=gloc, fontsize=gsiz)
+
     
     output_kind(figk, fign, True)

trunk/tools/model_graphics.py

@@ -1831 +1831 @@
               axisvals + ':' + ','.join(CFvplot) + ':' + Aline + ',' + Bline +       \
               ':2.,2.:' + Akind + ',' + Bkind + ':2.,2.:,:' + figtit + ':' +         \
-              spacedim + ':0:' +  finame.replace('.'+kfig, '') + ':' + kfig
+              spacedim + ':0,auto:' +  finame.replace('.'+kfig, '') + ':' + kfig +   \
+              ':True'
 
             fvarS = ','.join(vplot)
@@ -1898 +1899 @@
               timefmt + ':' + timeaxis + ':' + ','.join(CFvplot) + ':' + Aline + ',' \
               + Bline + ':2.,2.:' + Akind + ',' + Bkind + ':2.,2.:,:' + figtit + ':' \
-              + timelabel + ':0:' +  finame.replace('.'+kfig, '') + ':' + kfig
+              + timelabel + ':0,auto:' +  finame.replace('.'+kfig, '') + ':' +       \
+              + kfig + ':True' 
 
             fvarS = ','.join(vplot)
@@ -1990 +1992 @@
 
             graphvals = spacedim + ':' + axisvals + ':' + sdlab + ':' + leglabels +  \
-              ':' + CFvplot[0] + ':' + figtit + ':0:' + lines + ':' + kinds + ':' +  \
+              ':' + CFvplot[0] +':'+ figtit + ':0|auto:' + lines +':'+ kinds + ':' + \
               marks +':'+ sizes +':'+ sizes +':all:'+ finame.replace('.'+kfig, '') + \
-              ':' + kfig
+              ':' + kfig + ':True'
 
             fvarS = vplot[0]
@@ -2065 +2067 @@
               CFvplot[0] + ';' + figtit + ';None;time|' + '|'.join(tvals) +          \
               ';0|auto;' + kfig + ';' + kinds + ';' + lines + ';' + marks + ';' +    \
-              sizes + ';' + sizes + ';all;-1' 
+              sizes + ';' + sizes + ';all;-1;True' 
 
             fvarS = vplot[0]
@@ -2165 +2167 @@
 
             graphvals = ','.join(CFvplot)
-            graphvals = graphvals + ';'+ dims +';'+ cbar +  \
-              ';' + ckind + ',' + cline + ';' + cfmt + ';' + srange + ';' + crange + \
+            graphvals = graphvals + ';auto;'+ dims +';'+ cbar + ',auto,auto' + ';' + \
+              ckind + ',' + cline + ';' + cfmt + ';' + srange + ';' + crange +       \
               ',9;' + figtit + ';' + kfig + ';' + reverse + ';' + 'time|' + tunits + \
-              '|'+ timekind + '|' + timefmt + '|' + timelabel
+              '|'+ timekind + '|' + timefmt + '|' + timelabel + ';True'
 
             fvarS = ','.join(vplot)