Changeset 684 in lmdz_wrf

Timestamp:

Jan 22, 2016, 7:15:20 PM (10 years ago)

Author:

lfita

Message:

Adding line styles on `plot_lines_time'
Adding function `LinesPointsStyles?' to provide a list of lines and points

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -1836 +1836 @@
           9: 'upper center', 10: 'center'
         [graphk]: kind of the graphic
+        [lines]: ',' list of type of lines, None for automatic, single value all the same
         [collines]: ',' list of colors for the lines, None for automatic, single 
           value all the same
@@ -1856 +1857 @@
 
     expectargs = '[dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];'
-    expectargs = expectargs + '[timevals];[locleg];[graphk];[collines];[points];'
+    expectargs = expectargs + '[timevals];[locleg];[graphk];[lines];[collines];[points];'
     expectargs = expectargs + '[pointfreq];[period]'
     drw.check_arguments(fname,len(expectargs.split(';')),values,';',expectargs)
@@ -1870 +1871 @@
     locleg = int(values.split(';')[7])
     graphk = values.split(';')[8]
-    collines0 = values.split(';')[9]
-    points0 = values.split(';')[10]
-    pointfreq0 = values.split(';')[11]
-    period = values.split(';')[12]
+    lines0 = values.split(';')[9]
+    collines0 = values.split(';')[10]
+    points0 = values.split(';')[11]
+    pointfreq0 = values.split(';')[12]
+    period = values.split(';')[13]
 
     Nfiles = len(ncfiles)
@@ -1888 +1890 @@
     else:
         varname = [varname0]
+
+# Multiple lines types?
+    if lines0.find(',') != -1:
+        lines = lines0.split(',')
+    elif lines0 == 'None':
+        lines = None
+    else:
+        lines = []
+        for il in range(Nfiles):
+            lines.append(lines0)
 
 # Multiple color names?
@@ -1902 +1914 @@
     if points0.find(',') != -1:
         points = points0.split(',')
-        for ip in range(len(points)):
-            points[ip] = points[ip]
     elif points0 == 'None':
         points = None
@@ -1909 +1919 @@
         points = []
         for ip in range(Nfiles):
-            points.append(points0+'-')
+            points.append(points0)
 
 # Getting values
@@ -2051 +2061 @@
 
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, legvals, vartit,   \
-      varunits, timepos, timelabels, title, locleg, graphk, collines, points, pointfreq)
+      varunits, timepos, timelabels, title, locleg, graphk, lines, collines, points, \
+      pointfreq)
 
     return

trunk/tools/drawing_tools.py

@@ -5399 +5399 @@
     return
 
+def LinesPointsStyles(Nstyles, lines, points, ptfreq):
+    """ Function to provide the lines & points styles
+      Nstyles= total number of styles
+      lines= list of lines, None for no value
+      points= list of points, None for no value
+      ptfreq= frequency for the points, None for all values
+    >>> Nstyles = 3
+    >>> lines = ['-']
+    >>> points = ['x', '*', 'o']
+    >>> ptfreq = 2
+    >>> lines, points = LinesPointsStyles(Nstyles, lines, points, ptfreq)
+    ['-', '-', '-']
+    ['x', '*', 'o']
+    """
+    fname = 'LinesPointsStyles'
+
+# Canging line kinds every 7 lines (end of standard colors)
+    uselines = []
+    usepoints = []
+    if lines is None:
+        Nklns = len(linekindsauto)
+        for il in range(Nstyles):
+            iil = np.mod(il,Nklns)
+            uselines.append(linekindsauto[iil])
+    else:
+        Nklns = len(lines)
+        if Nklns == 1:
+            for il in range(Nstyles):
+                uselines.append(lines[0])
+        else:
+            if Nklns != Nstyles:
+                print errormsg
+                print '  ' + fname + ': number of provided lines:', Nklns,           \
+                  'and required:', Nstyles,'differ !!'
+                quit(-1)
+            uselines = lines
+
+    if points is None:
+        Nkpts = len(pointkindsauto)
+        for ip in range(Nstyles):
+            iip = np.mod(ip,Nkpts)
+            usepoints.append(pointkindsauto[iip])
+    else:
+        Nkpts = len(points)
+        if Nkpts == 1:
+            for ip in range(Nstyles):
+                usepoints.append(points[0])
+        else:
+            if Nkpts != Nstyles:
+                print errormsg
+                print '  ' + fname + ': number of provided points:', Nkpts,          \
+                  'and required:', Nstyles,'differ !!'
+                quit(-1)
+            usepoints = points
+
+    Nlins = len(uselines)
+    Npnts = len(usepoints)
+
+    lkinds = []
+    pkinds = []
+    if ptfreq is not None:
+        lkinds = uselines
+        pkinds = usepoints
+    else:
+        for ilp in range(Nstyles):
+            lkinds.append(usepoints[ilp] + uselines[ilp])
+            
+    return lkinds, pkinds
+
 def plot_lines_time(vardv, varvv, vaxis, dtit, linesn0, vtit, vunit, tpos, tlabs,    \
   gtit, gloc, kfig, lsl, coll, ptl, ptf):
@@ -5434 +5503 @@
         quit()
 
-# Canging line kinds every 7 lines (end of standard colors)
-    linekinds = []
-    pointkinds = []
-    Nklns = len(linekindsauto)
-    Nkpts = len(pointkindsauto)
-    if ptl is None:
-        if ptf is None:
-            for il in range(Nklns):
-                for ip in range(Nkpts):
-                    linekinds.append(pointkindsauto[ptype] + linekindsauto[il])
-        else:
-            for ptype in range():
-                for ip in range(Nkpts):
-                    linekinds.append('-')
-                    pointkinds.append(pointkindsauto[ptype])
-    else:
-        if ptf is None:
-            for pt in ptl:
-                linekinds.append(pt + '-')
-        else:
-            pointkinds = ptl
-            for pt in ptl:
-                linekinds.append('-')
-
     Ntraj = len(vardv)
 
-    N7lines = 0
+    linekinds, pointkinds = LinesPointsStyles(Ntraj, lsl, ptl, ptf)
 
     plt.rc('text', usetex=True)