Changeset 620 in lmdz_wrf

Timestamp:

Aug 21, 2015, 3:26:11 PM (10 years ago)

Author:

lfita

Message:

Adding 'points' as paramter on 'draw_lines_time'

Location:

trunk/tools

Files:

• drawing.py (modified) (6 diffs)
• drawing_tools.py (modified) (7 diffs)

trunk/tools/drawing.py

@@ -1799 +1799 @@
       ncfilens= [filen] ',' separated list of netCDF files
       values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[timevals];[locleg];
-        [graphk];[collines];[period]
+        [graphk];[collines];[points];[period]
         [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')
@@ -1822 +1822 @@
           9: 'upper center', 10: 'center'
         [graphk]: kind of the graphic
-        [collines]: ',' list of colors for the lines or None for automatic
+        [collines]: ',' list of colors for the lines, None for automatic, single 
+          value all the same
+        [points]: ',' list of type of points for the lines, None for automatic, single
+          value all the same
         [period]: which period to plot
           '-1': all period
@@ -1838 +1841 @@
 
     expectargs = '[dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];'
-    expectargs = expectargs + '[timevals];[locleg];[graphk];[collines];[period]'
+    expectargs = expectargs + '[timevals];[locleg];[graphk];[collines];[points];'
+    expectargs = expectargs + '[period]'
     drw.check_arguments(fname,len(expectargs.split(';')),values,';',expectargs)
 
@@ -1852 +1856 @@
     graphk = values.split(';')[8]
     collines0 = values.split(';')[9]
-    period = values.split(';')[10]
+    points0 = values.split(';')[10]
+    period = values.split(';')[11]
 
     Nfiles = len(ncfiles)
@@ -1871 +1876 @@
     if collines0.find(',') != -1:
         collines = collines0.split(',')
-    else:
+    elif collines == 'None':
         collines = None
+    else:
+        collines = []
+        for ip in range(Nfiles):
+            collines.append(collines0)
+
+# Multiple point types?
+    if points0.find(',') != -1:
+        points = points0.split(',')
+    elif points0 == 'None':
+        points = None
+    else:
+        points = []
+        for ip in range(Nfiles):
+            points.append(points0)
 
 # Getting values
@@ -2006 +2025 @@
       drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit,                  \
         leglabels.split(','), vartit, varunits, timepos, timelabels, title, locleg,  \
-        graphk, collines)
+        graphk, collines, points)
     else:
       drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit,                  \

trunk/tools/drawing_tools.py

@@ -5205 +5205 @@
 
 def plot_lines_time(vardv, varvv, vaxis, dtit, linesn0, vtit, vunit, tpos, tlabs,    \
-  gtit, gloc, kfig, coll):
+  gtit, gloc, kfig, coll, ptl):
     """ Function to plot a collection of lines with a time axis
       vardv= list of set of dimension values
@@ -5223 +5223 @@
       kfig= kind of figure
       coll= ',' list of colors for the lines or None for automatic
+      coll= ',' list of colors for the lines, None for automatic, single
+          value all the same
+      ptl= ',' list of type of points for the lines, None for automatic, single
+          value all the same
+
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
   ['2.5'], 'sin', '-', 'sinus frequency dependency', 'pdf')
@@ -5234 +5239 @@
 
 # Canging line kinds every 7 lines (end of standard colors)
-    linekinds=['.-','x-','o-']
+    linekinds = []
+    if ptl is None:
+        linekindsauto=['.-','x-','o-']
+        for ptype in range(4):
+            for ip in range(7):
+                linekinds.append(linekindsauto[ptype])
+    else:
+        linekinds = ptl
 
     Ntraj = len(vardv)
@@ -5256 +5268 @@
         for il in range(Ntraj):
             if coll is None:
-                plt.plot(varvv[il], vardv[il], linekinds[N7lines], label= linesn[il])
+                plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il])
             else:
-                plt.plot(varvv[il], vardv[il], linekinds[N7lines], label= linesn[il],\
+                plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il],\
                   color=coll[il])
 
@@ -5270 +5282 @@
             if mindv < xtrmdv[0]: xtrmdv[0] = mindv
             if maxdv > xtrmdv[1]: xtrmdv[1] = maxdv
-
-            if il == 6: N7lines = N7lines + 1
 
         plt.xlabel(vtit + ' (' + vunit + ')')
@@ -5284 +5294 @@
         for il in range(Ntraj):
             if coll is None:
-                plt.plot(vardv[il], varvv[il], linekinds[N7lines], label= linesn[il])
+                plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il])
             else:
-                plt.plot(vardv[il], varvv[il], linekinds[N7lines], label= linesn[il],\
+                plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il],\
                   color=coll[il])
 
@@ -5298 +5308 @@
             if mindv < xtrmdv[0]: xtrmdv[0] = mindv
             if maxdv > xtrmdv[1]: xtrmdv[1] = maxdv
-
-            if il == 6: N7lines = N7lines + 1
 
         plt.xlabel(dtit)