Changeset 687 in lmdz_wrf for trunk/tools/drawing.py

Timestamp:

Jan 28, 2016, 1:38:11 PM (9 years ago)

Author:

lfita

Message:

Adding linewithds and linepoints on `ColorsLinesPointsStyles?'
Adding `markerevery' on 'plot_lines_time'

File:

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

trunk/tools/drawing.py

@@ -1813 +1813 @@
       ncfilens= [filen] ',' separated list of netCDF files
       values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[timevals];[locleg];
-        [graphk];[collines];[points];[pointfreq];[period]
+        [graphk];[collines];[points];[linewidths];[pointsizes];[pointfreq];[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')
@@ -1841 +1841 @@
         [points]: ',' list of type of points for the lines, None for automatic, single
           value all the same
+        [linewidths]: ',' list of widths for the lines, None for automatic, single
+          value all the same
+        [pointsizes]: ',' list of widths for the lines, None for automatic, single
+          value all the same
         [pointfreq]: frequency of point plotting, 'all' for all time steps
         [period]: which period to plot
@@ -1858 +1862 @@
     expectargs = '[dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];'
     expectargs = expectargs + '[timevals];[locleg];[graphk];[lines];[collines];[points];'
-    expectargs = expectargs + '[pointfreq];[period]'
+    expectargs = expectargs + '[linewidths];[pointsizes];[pointfreq];[period]'
     drw.check_arguments(fname,len(expectargs.split(';')),values,';',expectargs)
 
@@ -1874 +1878 @@
     collines0 = values.split(';')[10]
     points0 = values.split(';')[11]
-    pointfreq0 = values.split(';')[12]
-    period = values.split(';')[13]
+    linewidths0 = values.split(';')[12]
+    pointsizes0 = values.split(';')[13]
+    pointfreq0 = values.split(';')[14]
+    period = values.split(';')[15]
 
     Nfiles = len(ncfiles)
@@ -1904 +1910 @@
     if collines0.find(',') != -1:
         collines = collines0.split(',')
-    elif collines == 'None':
+    elif collines0 == 'None':
         collines = None
     else:
@@ -1920 +1926 @@
         for ip in range(Nfiles):
             points.append(points0)
+
+# Multiple line sizes?
+    if linewidths0.find(',') != -1:
+        linewidths = []
+        Nlines = len(linewidths0.split(','))
+        for il in Nlines:
+          linewidths.append(np.float(linewidths0.split(',')[il]))
+    elif linewidths0 == 'None':
+        linewidths = None
+    else:
+        linewidths = [np.float(linewidths0)]
+
+# Multiple point sizes?
+    if pointsizes0.find(',') != -1:
+        pointsizes = []
+        Npts = len(pointsizes0.split(','))
+        for ip in Npts:
+          pointsizes.append(np.float(pointsizes0.split(',')[ip]))
+    elif pointsizes0 == 'None':
+        pointsizes = None
+    else:
+        pointsizes = [np.float(pointsizes0)]
 
 # Getting values
@@ -2062 +2090 @@
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, legvals, vartit,   \
       varunits, timepos, timelabels, title, locleg, graphk, lines, collines, points, \
-      pointfreq)
+      linewidths, pointsizes, pointfreq)
 
     return