Changeset 1976 in lmdz_wrf

Timestamp:

Jul 25, 2018, 3:31:34 PM (7 years ago)

Author:

lfita

Message:

Adding time-range in `draw_lines_time' and some minor changes

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -2549 +2549 @@
     # Legend
     locleg, legfontsize = drw.legend_values(legvals,'|')
+    legconf = [locleg, legfontsize]
 
 # Getting values
@@ -2732 +2733 @@
 
 # Times
+    ranget = [mintval, maxtval]
 
     dtvals = (maxtval - mintval)/dimt
@@ -2769 +2771 @@
 
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, xaxis, yaxis, dimtit,      \
-      legvals, vartit, varunits, timepos, timelabels, title, locleg, legfontsize,    \
+      legvals, vartit, varunits, timepos, timelabels, title, legconf, ranget,        \
       graphk, valmin, valmax, lines, collines, points, linewidths, pointsizes,       \
       pointfreq, close)

trunk/tools/drawing_tools.py

@@ -6489 +6489 @@
 
 def plot_lines_time(vardv, varvv, vaxis, xaxv, yaxv, dtit, linesn0, vtit, vunit,     \
-  tpos, tlabs, gtit, gloc, gsize, kfig, vmin, vmax, lsl, coll, ptl, lwidth, psize,   \
+  tpos, tlabs, gtit, legv, trng, kfig, vmin, vmax, lsl, coll, ptl, lwidth, psize,    \
   ptf, ifclose):
     """ Function to plot a collection of lines with a time axis
@@ -6506 +6506 @@
       vmin= minimum value for the axis-value 'auto' for use the extreme
       vmax= maximum value for the axis-value 'auto' for use the extreme
-      gloc= location of the legend (0, autmoatic)
-        1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
-        5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
-        9: 'upper center', 10: 'center'
-      gsize= fontsize of the legend
+      legv = [gloc, gsize] legend values
+        gloc= location of the legend (0, autmoatic)
+          1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
+          5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
+          9: 'upper center', 10: 'center'
+        gsize= fontsize of the legend
+      trng= actual range of time values [tmin, tmax]
       kfig= kind of figure
       lsl= ',' list of line styles
@@ -6642 +6644 @@
             xmax = vmax
 
+        plt.yticks(tpos, tlabs)
+
         plt.xlim(xmin,xmax)
         plt.ylim(xtrmdv[0],xtrmdv[1])
-
-        plt.yticks(tpos, tlabs)
     else:
         for il in range(Ntraj):
@@ -6680 +6682 @@
             ymax = vmax
 
-        plt.xlim(xtrmdv[0],xtrmdv[1])
-        plt.ylim(ymin,ymax)
-
 #        plt.xlim(np.min(varTdv),np.max(varTdv))
 #        plt.ylim(np.min(varTvv),np.max(varTvv))
         plt.xticks(tpos, tlabs)
+        plt.xlim(xtrmdv[0],xtrmdv[1])
+        plt.ylim(ymin,ymax)
 
     figname = 'lines_time'
@@ -6692 +6693 @@
     plt.title(graphtit)
     if linesn0 is not None:
-        plt.legend(loc=gloc, prop={'size':gsize})
+        print 'Lluis: legv:', legv
+        plt.legend(loc=legv[0], prop={'size':legv[1]})
 
     output_kind(kfig, figname, ifclose)