Changeset 1449 in lmdz_wrf for trunk/tools

Timestamp:

Feb 13, 2017, 3:43:57 PM (8 years ago)

Author:

lfita

Message:

Fixing right url for the source of the Taylor diagram from Yannick Copin

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -3260 +3260 @@
     pointsize = np.float(values.split(':')[6])
     labelsv = values.split(':')[7]
-    loclegend = values.split(':')[8]
+    legvals = values.split(':')[8]
     figureK = values.split(':')[9]
 
@@ -3319 +3319 @@
         labels = labelsv.split(',')
 
+    locleg, sizeleg = legend_values(legvals,'|')
+
     drw.plot_list_points(lonvals, latvals, lonname, latname, gtit, figureK, pointcolor, pointtype,    \
-      pointsize, labels, loclegend, kindfigure, fname)
+      pointsize, labels, locleg, sizeleg, kindfigure, fname)
 
     onc.close()
@@ -5464 +5466 @@
      Taylor diagram (Taylor, 2001) test implementation.
 
-     http://www-pcmdi.llnl.gov/about/staff/Taylor/CV/Taylor_diagram_primer.htm
+     https://gist.github.com/ycopin/3342888
 
      __version__ = "Time-stamp: <2012-02-17 20:59:35 ycopin>"

trunk/tools/drawing_tools.py

@@ -3243 +3243 @@
     return
 
-def plot_list_points(xval, yval, varxn, varyn, vtit, figk, color, ptk, pts, labels, lloc, kfig, figname):
+def plot_list_points(xval, yval, varxn, varyn, vtit, figk, color, ptk, pts, labels,  \
+  lloc, lsiz, kfig, figname):
     """ plotting points
       [x/yval]: x,y values to plot
       var[x/y]n: names of the x,y variables
-      vtit= title of the graph ('|' for spaces)
+      vtit= title of the graph
       figK= kind of figure
         'legend': only points in the map with the legend with the names
@@ -3256 +3257 @@
       labels= list of labels for the points (None, no labels)
       lloc = localisation of the legend
+      lsiz = font size of labels of the legend
       kfig= kind of figure (jpg, pdf, png)
       figname= name of the figure
@@ -3274 +3276 @@
         for iv in range(len(xval)):
 #            print iv,xval[iv],yval[iv],labels[iv],ptkinds[N7pts]
-            plt.plot(xval[iv],yval[iv], ptk, markersize=pts, label=labels[iv])
+            plt.plot(xval[iv],yval[iv], ptk, markersize=pts,                         \
+              gen.latex_text(label=labels[iv]))
 
         if figk[0:8] == 'labelled':
@@ -3280 +3283 @@
             txtcol=figk.split(',')[2]
             for iv in range(len(xval)):
-                plt.annotate(labels[iv], xy=(xval[iv],yval[iv]), xycoords='data',    \
-                  fontsize=txtsize, color=txtcol)
+                plt.annotate(gen.latex_text(labels[iv]), xy=(xval[iv],yval[iv]),     \
+                  xycoords='data', fontsize=txtsize, color=txtcol)
         elif figk == 'legend':
-            plt.legend(loc=lloc)
+            plt.legend(loc=lloc, prop={'size':lsiz})
 
     else: 
@@ -3291 +3294 @@
     plt.ylabel(varyn)
 
-    graphtit = vtit.replace('_','\_').replace('&','\&')
-
-    plt.title(graphtit.replace('|', ' '))
+    graphtit = gen.latex_text(vtit)
+
+    plt.title(graphtit)
     
     output_kind(kfig, figname, True)
@@ -8412 +8415 @@
      Taylor diagram (Taylor, 2001) test implementation.
 
-     http://www-pcmdi.llnl.gov/about/staff/Taylor/CV/Taylor_diagram_primer.htm
+     https://gist.github.com/ycopin/3342888
 
      __version__ = "Time-stamp: <2012-02-17 20:59:35 ycopin>"
@@ -8439 +8442 @@
     import mpl_toolkits.axisartist.grid_finder as GF
 
-    fname = 'plot_Taylor2'
+    fname = 'plot_Taylor'
     colelines = '#DDDDDD'