Changeset 1479 in lmdz_wrf

Timestamp:

Mar 31, 2017, 4:20:04 PM (8 years ago)

Author:

lfita

Message:

Improving `draw_points' by adding background color on 'labelled'

Location:

trunk/tools

Files:

• documentation/plotting/plot_points.html (modified) (2 diffs)
• drawing.py (modified) (4 diffs)
• drawing_tools.py (modified) (5 diffs)

trunk/tools/documentation/plotting/plot_points.html

@@ -52 +52 @@
     &nbsp;&nbsp;&nbsp;&nbsp;[kindfigure]: kind of figure<BR>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'legend': only points in the map with the legend with the names<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'labelled',[txtsize],[txtcol]: points with the names and size, color of text<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'labelled',[txtsize],[txtcol],[txtbckgcol]: points with the names and size, color of text and background <BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;color ('None' for without)<BR>
     &nbsp;&nbsp;&nbsp;&nbsp;[pointcolor]: color for the points ('auto' for "red")<BR>
     &nbsp;&nbsp;&nbsp;&nbsp;[pointlabels]: ',' of labels [only used if [collab]='None'] ('None' for no labels, '!' for spaces)<BR>
@@ -87 +88 @@
     </DIV>
     <DIV CLASS="valins">
-      $ python ${pyHOME}/drawing.py -o draw_points -S 'SuperStorm/tslist.dat,#,3,2,1:SuperStorm|sfc|stations:auto:cyl,i:labelled,10,r:auto:None:0:png:stations_loc:True' -f 'geo_em.d02.nc,XLONG_M,XLAT_M,HGT_M,Time|0@west_east|30;180;1@south_north|175;255;1,height,0.,1500.,terrain,auto,auto,m'
+      $ python ${pyHOME}/drawing.py -o draw_points -S 'SuperStorm/tslist.dat,#,3,2,1:SuperStorm|sfc|stations:auto:cyl,i:labelled,10,r,None:auto:None:0|12:png:stations_loc:True' -f 'geo_em.d02.nc,XLONG_M,XLAT_M,HGT_M,Time|0@west_east|30;180;1@south_north|175;255;1,height,0.,1500.,terrain,auto,auto,m'
     </DIV>
   </BODY>

trunk/tools/drawing.py

@@ -3016 +3016 @@
         [kindfigure]: kind of figure
           'legend': only points in the map with the legend with the names
-          'labelled',[txtsize],[txtcol]: points with the names and size, color of text
+          'labelled',[txtsize],[txtcol],[txtbckgcol]: points with the names and size, color of text and background 
+            color ('None' for without)
         [pointcolor]: color for the points ('auto' for "red")
         [pointlabels]: ',' of labels [only used if [collab]='None'] ('None' for no labels, '!' for spaces)
@@ -3058 +3059 @@
 
     expectargs = '[ptasciifile]:[gtit]:[dimxyfmt]:[mapvalues]:[kindfigure]:' +       \
-      '[pointcolor]:[pointlabels]:[locleg]:[figurek]:[figuren]:[close]'
+      '[pointcolor]:[pointlabels]:[legvals]:[figurek]:[figuren]:[close]'
  
     drw.check_arguments(fname,values,expectargs,':')
@@ -3069 +3070 @@
     pointcolor = values.split(':')[5]
     pointlabels = values.split(':')[6].replace('!',' ')
-    locleg = int(values.split(':')[7])
+    legvalues = values.split(':')[7]
     figureko = values.split(':')[8]
     figuren = values.split(':')[9]
@@ -3233 +3234 @@
         mapV = mapvalues
 
+    # legend
+    locleg, sizeleg = drw.legend_values(legvalues, '|')
+
     drw.plot_points(xptval, yptval, lonv, latv, varextra, varextrav, gtit, xaxis,    \
-      yaxis, mapV, kindfigure, pointcolor, ptlabels, locleg, figureko, figuren, close)
+      yaxis, mapV, kindfigure, pointcolor, ptlabels, locleg, sizeleg, figureko,      \
+      figuren, close)
 
     onc.close()

trunk/tools/drawing_tools.py

@@ -3004 +3004 @@
 
 def plot_points(xval, yval, vlon, vlat, extravals, extrapar, vtit, xaxv, yaxv, mapv, \
-  figk, color, labels, lloc, kfig, figname, ifclose):
+  figk, color, labels, lloc, gsize, kfig, figname, ifclose):
     """ plotting points
       [x/yval]: x,y values to plot
@@ -3031 +3031 @@
       labels= list of labels for the points (None, no labels)
       lloc = localisation of the legend
+      gsize = font size of the legend
       kfig= kind of figure (jpg, pdf, png)
       figname= name of the figure
@@ -3100 +3101 @@
     dimyT = dimyT0
 
-# Canging line kinds every 7 pts (end of standard colors)
+# Changing line kinds every 7 pts (end of standard colors)
     ptkinds=['.','x','o','*','+','8','>','D','h','p','s']
 
@@ -3174 +3175 @@
 # Extra values
     if extravals is not None:
+        if len(extravals.shape) != 2:
+            print errormsg
+            print '  ' + fname + ': extravalues must be 2-rank !!'
+            print '    given shape:', extravals.shape
+            quit(-1)
+
         plt.pcolormesh(x, y, extravals, cmap=plt.get_cmap(extrapar[3]),              \
           vmin=extrapar[1], vmax=extrapar[2])
@@ -3191 +3198 @@
 
     if labels is not None:
-        for iv in range(len(xval)):
-            if np.mod(iv,7) == 0: N7pts = N7pts + 1
-#            print iv,xval[iv],yval[iv],labels[iv],ptkinds[N7pts]
-            plt.plot(xval[iv],yval[iv], ptkinds[N7pts],label=labels[iv])
-
         if figk[0:8] == 'labelled':
-            if len(figk.split(',')) != 3:
+            if len(figk.split(',')) != 4:
                 print errormsg
-                print '  ' + fname + ": 'labelled' requires two additional values !!"
-                print "    'labelled',[txtsize],[txtcolor]"
+                print '  ' + fname + ": 'labelled' requires three additional values !!"
+                print "    'labelled',[txtsize],[txtcolor],[txtbckgcolor]"
                 quit(-1)
             txtsize=int(figk.split(',')[1])
             txtcol=figk.split(',')[2]
+            bcktxtcol=figk.split(',')[3]
+            if bcktxtcol != 'None':
+                for iv in range(len(xval)):
+                    plt.annotate(labels[iv], xy=(xval[iv],yval[iv]), xycoords='data',\
+                      fontsize=txtsize, color=txtcol, backgroundcolor=bcktxtcol,     \
+                      zorder=2)
+            else:
+                for iv in range(len(xval)):
+                    plt.annotate(labels[iv], xy=(xval[iv],yval[iv]), xycoords='data',\
+                      fontsize=txtsize, color=txtcol, zorder=2)
             for iv in range(len(xval)):
-                plt.annotate(labels[iv], xy=(xval[iv],yval[iv]), xycoords='data',    \
-                  fontsize=txtsize, color=txtcol)
-        elif figk == 'legend':
-            plt.legend(loc=lloc)
+                if np.mod(iv,7) == 0: N7pts = N7pts + 1
+                plt.plot(xval[iv],yval[iv], ptkinds[N7pts], color=txtcol, zorder=3)
+        elif figk[0:6]== 'legend':
+            for iv in range(len(xval)):
+                if np.mod(iv,7) == 0: N7pts = N7pts + 1
+                plt.plot(xval[iv],yval[iv], ptkinds[N7pts], label=labels[iv])
+            plt.legend(loc=lloc, prop={'size':gsize})
 
     else: