Changeset 1514 in lmdz_wrf

Timestamp:

Apr 11, 2017, 12:01:51 AM (8 years ago)

Author:

lfita

Message:

In `draw_2lines_time':

Changing ';' character list in marks list
Fixing extreme values from `variables_values'
Fixing other mistakes

File:

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

trunk/tools/drawing.py

@@ -5477 +5477 @@
        [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[legvals]:[figname]:[figkind]:[close]
         [timevardim]: name of the common variable-dimension time
-        [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic; 'Extrs' from values extremes)
-        [varangeB]: ',' separated list of range (min,max) for B values ('None', automatic; 'Extrs' from values extremes)
+        [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic from 'variables_values'; 'Extrs' from values extremes)
+        [varangeB]: ',' separated list of range (min,max) for B values ('None', automatic from 'variables_values'; 'Extrs' from values extremes)
         [timeaxisfmt]=[tkind];[tfmt]: format of the ticks for the time axis:
            [kind]: kind of time to appear in the graph
@@ -5492 +5492 @@
         [widths]: ',' list with widths of the lines for the variables ('None', automatic)
         [styles]: ',' list with the styles of the lines ('None', automatic)
-        [sizemarks]: ',' list with the size of the markers of the lines ('None', automatic)
-        [marks]: ',' list with the markers of the lines ('None', automatic)
+        [sizemarks]: ',' list with the size of the markers of the lines ('None', for 2.,2.)
+        [marks]: ';' list with the markers of the lines ('None', automatic)
         [graphtitle]: title of the figure ('!' for spaces)
         [labelaxis]: label in the figure of the common axis ('!' for spaces)
@@ -5517 +5517 @@
     expectargs = '[timevardim]:[varangeA]:[varangeB]:[timeaxisfmt]:[timeaxis]:' +    \
      '[figvarns]:[colors]:[widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:' +     \
-     '[labelaxis]:[lloc]:[figname]:[figkind]:[close]'
+     '[labelaxis]:[legvals]:[figname]:[figkind]:[close]'
  
     drw.check_arguments(fname,values,expectargs,':')
@@ -5531 +5531 @@
     styles = gen.str_list(values.split(':')[8],',')
     sizemarks = gen.str_list_k(values.split(':')[9],',','np.float')
-    marks = gen.str_list(values.split(':')[10],',')
+    marks = gen.str_list(values.split(':')[10],';')
     graphtitle = values.split(':')[11].replace('!',' ')
     labelaxis = values.split(':')[12].replace('!',' ')
@@ -5577 +5577 @@
         quit(-1)
 
+    valsA = gen.variables_values(invarns[0])
     if gen.searchInlist(objvA.ncattrs(), 'units'):
         varunits.append(drw.units_lunits(objvA.getncattr('units')))
     else:
-        valsA = gen.variables_values(invarns[0])
         varunits.append(drw.units_lunits(valsA[5]))
     if varangeA0 == 'None':
@@ -5617 +5617 @@
     tunitsB = objtB.getncattr('units')
 
+    valsB = gen.variables_values(invarns[1])
     if gen.searchInlist(objvB.ncattrs(), 'units'):
         varunits.append(drw.units_lunits(objvB.getncattr('units')))
     else:
-        valsB = gen.variables_values(invarns[1])
         varunits.append(drw.units_lunits(valsB[5]))
     if varangeB0 == 'None':
         varangeB = [valsB[2], valsB[3]]
     elif varangeB0 == 'Extrs':
-        varangeA = [np.min(varvalsA), np.max(varvalsA)]
+        varangeB = [np.min(varvalsB), np.max(varvalsB)]
     else:
         for iv in range(2): varangeB[iv] = np.float(varangeB0.split(',')[iv])