Merge pull request #2028 from UV-CDAT/issue_1845_animation_cmap_not_preserved

we used to have two path for rendering a frame

Author: doutriaux1

Packages/vcs/vcs/VTKAnimate.py

@@ -280,8 +280,8 @@ def reclaim_renderers(self):
         be.showGUI()
         be.renWin.Render()
 
-    def draw_frame(self, frame_num=None, render_offscreen=True,
-                   allow_static=True, main_window_png=False):
+    def draw_frame(self, frame_num=None, render_offscreen=False,
+                   allow_static=False, main_window_png=True):
         """
         Draws a frame on the canvas
           frame_num: Which frame to draw- defaults to self.frame_num
@@ -295,8 +295,7 @@ def draw_frame(self, frame_num=None, render_offscreen=True,
         else:
             self.frame_num = frame_num
 
-        if render_offscreen or (
-                allow_static and len(self.animation_files) == self.number_of_frames()):
+        if len(self.animation_files) == self.number_of_frames():
             # Attempt to extract the renderers and place them onto the create
             # thread
             self.extract_renderers()
@@ -318,7 +317,7 @@ def draw_frame(self, frame_num=None, render_offscreen=True,
 
             self.vcs_self.backend.renWin.Render()
 
-            if main_window_png:
+            if main_window_png or self.playback_params.zoom_factor != 1:
                 png_name = self.create_thread.get_frame_name(self.frame_num)
                 self.vcs_self.png(png_name)
                 self.animation_files = sorted(
@@ -346,4 +345,5 @@ def frame(self, frame):
         self.draw_frame(
             frame_num=frame,
             allow_static=False,
-            render_offscreen=False)
+            render_offscreen=False,
+            main_window_png=False)