Changeset 1132 in lmdz_wrf for trunk/tools

Timestamp:

Oct 3, 2016, 6:04:16 PM (9 years ago)

Author:

lfita

Message:

Fixing:

• `transform': by adding:

ax[x/y]kind= kind of axis reference

'fixpixel': pixel preserves size all along axis (default)
'data': pixel follows data values (as in a georeferenced map)

• including right use of `transform' in plot_2D_shadow

File:

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

trunk/tools/drawing_tools.py

@@ -1465 +1465 @@
 
 def transform(vals, trans, dxv='0', dyv='0', dxt='0', dyt='0', dxl='0',         \
-  dyl='0', dxtit='0', dytit='0'):
+  dyl='0', dxtit='0', dytit='0', axxkind='fixpixel', axykind='fixpixel'):
     """ Function to transform the values and the axes
       vals= values to transform
@@ -1475 +1475 @@
       d[x/y]l= original tick-labels for the [x/y]-axis
       d[x/y]tit= original titles for the [x/y]-axis
+      ax[x/y]kind= kind of axis reference
+        'fixpixel': pixel preserves size all along axis
+        'data': pixel follows data values (as in a georeferenced map)
 
     >>> mat = np.arange(15).reshape(3,5)
@@ -1631 +1634 @@
             if flip == 'x':
                 newvals = newvals[...,::-1]
-#                if wdvx:
-#                    if len(newdxv.shape) > 1:
-#                        newdxv = newdxv[...,::-1]
-#                    else:
-#                        newdxv = newdxv[::-1]
-#                if wdtx:
-#                    newdxt = newdxt[::-1]
-                if wdlx:
-                    newdxl = newdxl[::-1]
+                if axxkind == 'fixpixel':
+                    if wdtx:
+                        # No pixel deformation
+                        newdxt = 1.-newdxt
+                elif axxkind == 'data':
+                    if wdvx:
+                        if len(newdxv.shape) > 1:
+                            newdxv = newdxv[...,::-1]
+                        else:
+                            newdxv = newdxv[::-1]
+                    if wdtx:
+                        newdxt = newdxt[::-1]
+#                if wdlx:
+#                    newdxl = newdxl[::-1]
             elif flip == 'y':
                 newvals = newvals[...,::-1,:]
-#                if wdvy:
-#                    Ny=len(newdyt)
-#                    if len(newdyv.shape) > 1:
-#                        newdyv = newdyv[...,::-1]
-#                    else:
-#                        newdyv = newdyv[::-1]
-#                if wdty:
-#                    newdyt = newdyt[::-1]
-                if wdly:
-                    newdyl = newdyl[::-1]
+                # No pixel deformation
+                if axykind == 'fixpixel':
+                    if wdty:
+                        # No pixel deformation
+                        newdyt = 1.-newdyt
+                elif axykind == 'data':
+                    if wdvy:
+                        if len(newdyv.shape) > 1:
+                            newdyv = newdyv[...,::-1]
+                        else:
+                            newdyv = newdyv[::-1]
+                    if wdty:
+                        newdyt = newdyt[::-1]
+#                if wdly:
+#                    newdyl = newdyl[::-1]
             elif flip == 'z':
                 newvals = newvals[...,::-1,:,:]
@@ -3838 +3851 @@
     dimxv0 = dimxv.copy()
     dimyv0 = dimyv.copy()
-    dimxt0 = np.array(pretty_int(dimxv.min(),dimxv.max(),10))
-    dimyt0 = np.array(pretty_int(dimyv.min(),dimyv.max(),10))
+
+    dimxt0 = np.array(pretty_int(dimxv.min(),dimxv.max(),5))
+    dimyt0 = np.array(pretty_int(dimyv.min(),dimyv.max(),5))
     dimxl0 = []
     for i in range(len(dimxt0)): dimxl0.append('{:.1f}'.format(dimxt0[i]))
     dimyl0 = []
     for i in range(len(dimyt0)): dimyl0.append('{:.1f}'.format(dimyt0[i]))
+
     dimxT0 = variables_values(dimn[0])[0] + ' (' + units_lunits(dimxu) + ')'
     dimyT0 = variables_values(dimn[1])[0] + ' (' + units_lunits(dimyu) + ')'
+
+    if mapv is not None:
+        pixkind = 'data'
+    else:
+        # No following data values
+        dimxt0 = np.arange(len(dimxt0),dtype=np.float)/(len(dimxt0))
+        dimyt0 = np.arange(len(dimyt0),dtype=np.float)/(len(dimyt0))
+        pixkind = 'fixpixel'
 
     if reva is not None:
@@ -3933 +3956 @@
 
     else:
-        x = lon0
-        y = lat0
+        # No following data values
+        #x = dimxv
+        #y = dimyv
+        x = (dimxv-np.min(dimxv))/(np.max(dimxv) - np.min(dimxv))
+        y = (dimyv-np.min(dimyv))/(np.max(dimyv) - np.min(dimyv))
 
     vsend = np.zeros((2), dtype=np.float)
@@ -4034 +4060 @@
         plt.ylabel(dimyT)
 
-    txpos = pretty_int(x.min(),x.max(),5)
-    typos = pretty_int(y.min(),y.max(),5)
-    txlabels = list(txpos)
-    for i in range(len(txlabels)): txlabels[i] = '{:6g}'.format(txlabels[i])
-    tylabels = list(typos)
-    for i in range(len(tylabels)): tylabels[i] = '{:6g}'.format(tylabels[i])
+    # Using output from transform
+#    print 'x min:', x.min(),'max:',x.max()
+#    print 'y min:', y.min(),'max:',y.max()
+#    txpos = pretty_int(x.min(),x.max(),5)
+#    typos = pretty_int(y.min(),y.max(),5)
+#    txlabels = list(txpos)
+#    for i in range(len(txlabels)): txlabels[i] = '{:6g}'.format(txlabels[i])
+#    tylabels = list(typos)
+#    for i in range(len(tylabels)): tylabels[i] = '{:6g}'.format(tylabels[i])
 
     plt.axis([x.min(), x.max(), y.min(), y.max()])
 
     if mapv is None:
-        plt.xticks(txpos, txlabels)
-        plt.yticks(typos, tylabels)
+#        plt.xticks(txpos, txlabels)
+#        plt.yticks(typos, tylabels)
+        plt.xticks(dimxt, dimxl)
+        plt.yticks(dimyt, dimyl)
 
 # units labels
@@ -7508 +7539 @@
         
 #    graphtit = gtitle.replace('_','\_').replace('&','\&')
-    graphtit = gtitle
+    graphtit = gen.latex_text(gtitle)
 
     plt.title(graphtit,position=titleloc)