Changeset 562 in lmdz_wrf for trunk/tools

Timestamp:

Jul 6, 2015, 12:06:08 PM (10 years ago)

Author:

lfita

Message:

Adding `degrees' in 'units_lunits'
Adding no-legend option on 'draw_lines_time'

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -1803 +1803 @@
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
         [dimtit]: title for the common dimension ('|' for spaces)
-        [leglabels]: ',' separated list of names for the legend
+        [leglabels]: ',' separated list of names for the legend ('None', no legend)
         [vartit]: name of the variable in the graph
         [title]: title of the plot ('|' for spaces)
@@ -2003 +2003 @@
     timepos, timelabels = drw.CFtimes_plot(tvals, timeunit, timekind, timefmt)
 
-    drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, leglabels.split(','),   \
-      vartit, varunits, timepos, timelabels, title, locleg, graphk, collines)
-
+    if leglabels.find(',') != -1:
+      drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit,                  \
+        leglabels.split(','), vartit, varunits, timepos, timelabels, title, locleg,  \
+        graphk, collines)
+    else:
+      drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit,                  \
+        None, vartit, varunits, timepos, timelabels, title, locleg, graphk, collines)
     return
 

trunk/tools/drawing_tools.py

@@ -1445 +1445 @@
 
 # Units which does not change
-    same = ['1', 'category', 'day', 'deg', 'degrees East', 'degrees Nord',           \
+    same = ['1', 'category', 'day', 'deg', 'degrees', 'degrees East', 'degrees Nord',\
       'degrees North', 'g', 'gpm', 'hour', 'hPa', 'K', 'Km', 'kg', 'km', 'm',        \
       'minute', 'mm', 'month', 'Pa', 's', 'second', 'um', 'year', '-']
@@ -5194 +5194 @@
     return
 
-def plot_lines_time(vardv, varvv, vaxis, dtit, linesn, vtit, vunit, tpos, tlabs,     \
+def plot_lines_time(vardv, varvv, vaxis, dtit, linesn0, vtit, vunit, tpos, tlabs,    \
   gtit, gloc, kfig, coll):
     """ Function to plot a collection of lines with a time axis
@@ -5201 +5201 @@
       vaxis= which axis will be used for the time values ('x', or 'y')
       dtit= title for the common dimension
-      linesn= names for the legend
+      linesn= names for the legend (None, no legend)
       vtit= title for the vaxis
       vunit= units of the vaxis
@@ -5234 +5234 @@
     xtrmdv = [fillValueF,-fillValueF]
 
+# Do we have legend?
+##
+    if linesn0 is None:
+        linesn = []
+        for itrj in range(Ntraj):
+            linesn = str(itrj)
+    else:
+        linesn = linesn0
+
     if vaxis == 'x':
         for il in range(Ntraj):
@@ -5296 +5305 @@
 
     plt.title(graphtit)
-    plt.legend(loc=gloc)
+    if linesn0 is not None:
+        plt.legend(loc=gloc)
 
     print plt.xlim(),':', plt.ylim()