Changeset 441

Timestamp:

Dec 1, 2011, 2:31:04 PM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Bug fix for contours and mapmode 1

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (2 diffs)
• planetoplot.py (modified) (2 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -1039 +1039 @@
 # which can be usefull
 
-def call_contour(what_I_plot,error,lon,lat,vert,time,vertmode,ze_var2,indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile,var2,ticks):
+def call_contour(what_I_plot,error,x,y,m,lon,lat,vert,time,vertmode,ze_var2,indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile,var2,ticks):
       from matplotlib.pyplot import contour, plot
       import numpy as np
@@ -1058 +1058 @@
          if len(what_I_plot.shape) is 2:
              #zelevels=[0.2,0.4,0.6,0.8,1.]
-             cs = contour(x,y,what_I_plot, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
+             if mapmode == 0:cs = contour(x,y,what_I_plot, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
+             elif mapmode == 1:cs = m.contour(x,y,what_I_plot, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
              #clabel(cs,zelevels,inline=3,fmt='%1.1f',fontsize=7)
          ### If we plot a 1-D field

trunk/UTIL/PYTHON/planetoplot.py

@@ -281 +281 @@
        if var2:
            what_I_plot_contour, error = reducefield(all_var2[index_f], d4=indextime, d1=indexlon, d2=indexlat , d3=indexvert, yint=yintegral, alt=vert)
-           call_contour(what_I_plot_contour,error,lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
+           call_contour(what_I_plot_contour,error,x,y,m,lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
 
        #### Shaded plot
@@ -341 +341 @@
                        # Renew contours for movie frames which are not the first one
                        if var2:
-                         call_contour(what_I_plot_contour[imov,:,:],error,lon,lat,vert,time,vertmode,all_var2[index_f],imov,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
+                         call_contour(what_I_plot_contour[imov,:,:],error,x,y,m,lon,lat,vert,time,vertmode,all_var2[index_f],imov,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
                     if not tile:
                         #zelevels = np.linspace(zevmin*(1. + 1.e-7),zevmax*(1. - 1.e-7)) #,num=20)