Changeset 447 for trunk/UTIL/PYTHON/planetoplot.py

Timestamp:

Dec 2, 2011, 1:52:18 AM (13 years ago)

Author:

aslmd

Message:

GRAPHICS: fixed some stuff that were broken in previous commits: simple static contour plot, dumpbdy, re-encoding (is switched off for now).

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (5 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -285 +285 @@
        ticks = ndiv + 1
 
-       #### Contour plot -- to be activated with movies
-       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,x,y,m,lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
+       #### Contour plot. TBD: var2 could be just another instance of all_var
+       if var2:  what_I_plot_contour, error = reducefield( all_var2[index_f], d4=indextime, d1=indexlon, d2=indexlat , d3=indexvert, \
+                                                           yint=yintegral, alt=vert )
 
        #### Shaded plot
@@ -348 +347 @@
                        if invert_y:     lima,limb = mpl.pyplot.ylim() ; mpl.pyplot.ylim(limb,lima)
                        if ylog:         mpl.pyplot.semilogy()
-                       # Renew contours for movie frames which are not the first one
-                       if var2:
-                         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)
+                    # Renew contours for movie frames which are not the first one
+                    if var2:
+                         what_I_plot_contour_frame = what_I_plot_contour
+                         if mrate is not None: what_I_plot_contour_frame = what_I_plot_contour[imov,:,:]
+                         call_contour( what_I_plot_contour_frame,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)
@@ -365 +367 @@
                         colorbar( fraction=0.05,pad=0.03,format=daformat,\
                                   ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,20])),extend='neither',spacing='proportional' ) 
+                    ### movie stuff
                     figframe=mpl.pyplot.gcf()
                     if mrate is not None:
@@ -377 +380 @@
                         video.run(mframe)
                         mpl.pyplot.close()
+                    ### movie stuff
                     imov=imov+1
                  if mrate is not None: video.close()
@@ -481 +485 @@
             show()
 
-    ##################################
-    ### Getting more out of this video
-  
-    if mrate is not None:
-        print "Re-encoding movie.. first pass"
-        video.first_pass(filename=moviename,quality=mquality,rate=mrate)
-        print "Re-encoding movie.. second pass"
-        video.second_pass(filename=moviename,quality=mquality,rate=mrate)   
+    ###################################
+    #### Getting more out of this video -- PROBLEMS WITH CREATED VIDEOS
+    #
+    #if mrate is not None:
+    #    print "Re-encoding movie.. first pass"
+    #    video.first_pass(filename=moviename,quality=mquality,rate=mrate)
+    #    print "Re-encoding movie.. second pass"
+    #    video.second_pass(filename=moviename,quality=mquality,rate=mrate)   
 
     ###############