Addressed @dlonie comments, thanks!

Author: doutriaux1

Packages/vcs/Lib/VTKAnimate.py

@@ -14,10 +14,8 @@ def __init__(self, controller):
     self.controller = controller
 
   def run(self):
-    #self.describe()
     self.controller.animation_created = True
     self.controller._unique_prefix=hashlib.sha1(time.asctime()+str(random.randint(0,10000))).hexdigest()
-    #print "NFRAMES:",self.controller.number_of_frames()
 
   def describe(self):
     for info in self.controller.animate_info:
@@ -33,7 +31,6 @@ def describe(self):
 class VTKAnimationPlayback(animate_helper.AnimationPlayback):
   def __init__(self, controller):
     animate_helper.AnimationPlayback.__init__(self,controller)
-  pass
 
 class VTKAnimate(animate_helper.AnimationController):
     def __init__(self,vcs_self):
@@ -44,9 +41,8 @@ def __init__(self,vcs_self):
         import atexit
         atexit.register(self.close)
     def draw_frame(self):
-      #print "Drawing frame:",self.frame_num,self._unique_prefix
       png_name=os.path.join(os.environ["HOME"],".uvcdat",self._unique_prefix,"anim_%i.png" % self.frame_num)
-      if os.path.exists(png_name) and len(self.animation_files)==self.number_of_frames():# and self.playback_params.zoom_factor!=1:
+      if os.path.exists(png_name) and len(self.animation_files)==self.number_of_frames():
         ## Ok we have the pngs and we need to zoom, need to use png
         ## maybe the zoom factor thing can be taken off, not sure what's faster
         if not self.cleared:
@@ -66,24 +62,20 @@ def draw_frame(self):
             continue # nothing to do
           #Ok we have a slab, let's figure which slice it is
           args=[]
-          N=1
+          Ntot=1
           for a in slab.getAxisList()[:-self._number_of_dims_used_for_plot][::-1]:
-             n=self.frame_num/N % len(a)
-             N*=len(a)
+             n=self.frame_num/Ntot % len(a)
+             Ntot*=len(a)
              args.append(slice(n,n+1))
           args=args[::-1]
-          #if self.frame_num  == 0:
-            #print "NFrame <-> args: %i <-> %s" % (self.frame_num,args)
-            #print "BE ANIM:",disp.backend
           if slabs[1] is None:
               self.vcs_self.backend.update_input(disp.backend,slab(*args),update=True)
           else:
               self.vcs_self.backend.update_input(disp.backend,slab(*args),slabs[1](*args),update=True)
         self.vcs_self.backend.renWin.Render()
-        if not os.path.exists(png_name):
-            if not os.path.exists(os.path.dirname(png_name)):
-                os.makedirs(os.path.dirname(png_name))
-            self.vcs_self.png(png_name)
-            self.animation_files = sorted(glob.glob(os.path.join(os.path.dirname(png_name),"*.png")))
+        if not os.path.exists(os.path.dirname(png_name)):
+            os.makedirs(os.path.dirname(png_name))
+        self.vcs_self.png(png_name)
+        self.animation_files = sorted(glob.glob(os.path.join(os.path.dirname(png_name),"*.png")))
       if self.signals is not None:
         self.signals.drawn.emit(self.frame_num)

Packages/vcs/Lib/VTKPlots.py

@@ -626,6 +626,7 @@ def plotVector(self,data1,data2,tmpl,gm,vtk_backend_grid=None,vtk_backend_geo=No
     returned["vtk_backend_grid"]=vtk_backend_grid
     returned["vtk_backend_geo"]=geo
     missingMapper = vcs2vtk.putMaskOnVTKGrid(data1,vtk_backend_grid,None,False,deep=False)
+    #None/False are for color and cellData (sent to vcs2vtk.putMaskOnVTKGrid)
     returned["vtk_backend_missing_mapper"]=missingMapper,None,False
 
     w=vcs2vtk.generateVectorArray(data1,data2,vtk_backend_grid)
@@ -1158,8 +1159,6 @@ def plotContinents(self,x1,x2,y1,y2,projection,wrap,tmpl):
           contActor.GetProperty().SetColor(0.,0.,0.)
       else:
           geo=None
-      #contMapper.SetResolveCoincidentTopologyPolygonOffsetParameters(1, 1)
-      #contMapper.SetResolveCoincidentTopologyToPolygonOffset()
 
       ren = self.fitToViewport(contActor,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],wc=[x1,x2,y1,y2],geo=geo)
       if tmpl.data.priority!=0:
@@ -1626,30 +1625,26 @@ def fitToViewport(self,Actor,vp,wc=None,geo=None):
           if flipX:
             cam.Azimuth(180.)
       return Renderer
+
   def update_input(self,vtkobjects,array1,array2=None,update=True):
       if vtkobjects.has_key("vtk_backend_grid"):
-          #print "ok?"
           ## Ok ths is where we update the input data
           vg=vtkobjects["vtk_backend_grid"]
           data = vcs2vtk.numpy_to_vtk_wrapper(array1.filled(0.).flat, deep=False)
           pData= vg.GetPointData().GetScalars()
           if pData is not None:
-              #print "OK HERE"
               vg.GetPointData().SetScalars(data)
           else:
-              #print "OK HERE 2",array1.shape
               vg.GetCellData().SetScalars(data)
           if vtkobjects.has_key("vtk_backend_filter"):
-            #print "FILTER"
             vtkobjects["vtk_backend_filter"].Update()
           if vtkobjects.has_key("vtk_backend_missing_mapper"):
               missingMapper,color,cellData = vtkobjects["vtk_backend_missing_mapper"]
               missingMapper2 = vcs2vtk.putMaskOnVTKGrid(array1,vg,color,cellData,deep=False)
           else:
               missingMapper = None
           if vtkobjects.has_key("vtk_backend_contours"):
-            for i,c in enumerate(vtkobjects["vtk_backend_contours"]):
-              #print "UPING"
+            for c in vtkobjects["vtk_backend_contours"]:
               c.Update()
             ports=vtkobjects["vtk_backend_contours"]
           elif vtkobjects.has_key("vtk_backend_geofilters"):
@@ -1685,7 +1680,6 @@ def update_input(self,vtkobjects,array1,array2=None,update=True):
                   a[0].SetMapper(act.GetMapper())
                   i+=1
 
-              #vtkobjects["vtk_backend_wrapped_actor"].Update()
       taxis = array1.getTime()
       if taxis is not None:
           tstr = str(cdtime.reltime(taxis[0],taxis.units).tocomp(taxis.getCalendar()))

Packages/vcs/Lib/animate_helper.py

@@ -36,8 +36,6 @@ class animate_obj_old(object):
    ##############################################################################
    # Initialize the animation flags						#
    ##############################################################################
-   def __del__(self):
-       print "Deleting the animation"
    def __init__(self, vcs_self):
       self.vcs_self = vcs_self
       self.gui_popup = 0
@@ -598,8 +596,6 @@ def __init__(self):
     self._stop = threading.Event()
     self._running = threading.Event()
     self._running.set()
-  def __del__(self):
-      print "IN DEL"
   def stop(self):
     self._stop.set()
 
@@ -638,7 +634,6 @@ def run(self):
       if self.is_stopped():
         break
       self.wait_if_paused()
-      # print "RENDERING FRAME", i, "OF", len(all_args)
       if self._really_used!=[]:
         for j,a in enumerate(args):
           args[j]=a[:-3]+self._really_used[j]
@@ -674,7 +669,7 @@ def fps(self, value=None):
 
     """
     if value is not None:
-      #value = max(value, 0.5)
+      value = max(value, 0.5)
       self.frames_per_second = value
       return self
     return self.frames_per_second
@@ -782,10 +777,8 @@ def is_playing(self):
     return self.playback_running
 
   def playback(self):
-    #print "CREATED:",self.created()
     if (self.created() and 
         (self.playback_thread is None or not self.playback_thread.is_alive())):
-      #print "Starting playback"
       self.playback_thread = self.AnimationPlayback(self)
       self.playback_thread.start()
 
@@ -892,12 +885,10 @@ def generate_number_of_frames(self):
       if slabs[0] is None:
         ## Nothing to do
         continue
-      #print "SLAB:",slabs[0].shape
       if disp.g_type == "meshfill":
         try:
           g=slabs[0].getGrid()
           NXY=len(g.shape)
-          #print "GRID NX:",NXY
         except:
           ## No grid so slab1 rnk will tell us
           NXY=slabs[1].ndim-2 # lat/lon/vertices
@@ -910,7 +901,6 @@ def generate_number_of_frames(self):
       n=1
       for a in slabs[0].getAxisList()[:NXtraDims]:
         n*=len(a)
-      #print "This plot defines:",n,"frames"
       # We truncate to mininum number of common frames
       NFrames = min(n,NFrames)
     self._number_of_frames = NFrames
@@ -962,8 +952,6 @@ def get_all_frame_args(self):
                         break
                 args.append(I[1][1](**kw))
             args += [d.template,d.g_type,d.g_name]
-            #b=y.getboxfill(d.g_name)
-            #y.plot(*args,bg=1)
             frameArgs.append(args)
         all_args.append(frameArgs)
     return all_args
@@ -987,7 +975,6 @@ def render_frame(self, frame_args, frame_num, frame_kargs=[]):
     # and prevents segfaults when running multiple animations
     #self.vcs_self.replot()
 
-    #print "*************************************************************"
     self.create_canvas.clear()
     displays = []
     #checks = ["template","marker","texttable","textorientation","boxfill","isofill","isoline","line","textcombined"]
@@ -1011,7 +998,6 @@ def render_frame(self, frame_args, frame_num, frame_kargs=[]):
     return displays
 
   def draw_frame(self):
-    #print "drawing frame:",frame_num
     if frame_num is not None:
       self.frame_num = frame_num
     self.vcs_self.backend.clear()
@@ -1039,7 +1025,6 @@ def save(self,movie,bitrate=1024, rate=None, options=''):
         if rate is None:
             rate = self.playback_params.fps()
         files = os.path.join(os.path.dirname(self.animation_files[0]),"anim_%d.png")
-        print files
         self.vcs_self.ffmpeg(movie, files, bitrate, rate, options)
 
   def fps(self, value=None):

Packages/vcs/Lib/vcs2vtk.py

@@ -1319,6 +1319,7 @@ def starPoints(radius_outer, x, y, number_points = 5):
 
     theta += delta_theta
   return points
+
 def generateVectorArray(data1,data2,vtk_grid):
     u=numpy.ma.ravel(data1)
     v=numpy.ma.ravel(data2)
@@ -1348,6 +1349,7 @@ def generateVectorArray(data1,data2,vtk_grid):
     w = numpy_to_vtk_wrapper(w,deep=False)
     w.SetName("vectors")
     return w
+
 def stripGrid(vtk_grid):
     # Strip out masked points.
     if vtk_grid.IsA("vtkStructuredGrid"):