Merge pull request #1249 from UV-CDAT/meshfill_animation

Meshfill animation

Author: aashish24

Packages/vcs/Lib/VTKPlots.py

@@ -1032,6 +1032,10 @@ def plot2D(self,data1,data2,tmpl,gm,vtk_backend_grid=None,vtk_backend_geo=None):
               mapper.SetScalarModeToUseCellData()
               mappers.append([mapper,])
           else:
+              if isinstance(gm,vcs.meshfill.Gfm):
+                  doCellPointForScalar = True
+              else:
+                  doCellPointForScalar = False
               for j,color in enumerate(COLS[i]):
                   mapper = vtk.vtkPolyDataMapper()
                   lut = vtk.vtkLookupTable()
@@ -1047,7 +1051,7 @@ def plot2D(self,data1,data2,tmpl,gm,vtk_backend_grid=None,vtk_backend_geo=None):
                   lut.SetTableValue(0,r/100.,g/100.,b/100.)
                   mapper.SetLookupTable(lut)
                   mapper.SetScalarRange(l[j],l[j+1])
-                  luts.append([lut,[l[j],l[j+1],False]])
+                  luts.append([lut,[l[j],l[j+1],doCellPointForScalar]])
                   ## Store the mapper only if it's worth it?
                   ## Need to do it with the whole slab min/max for animation purposes
                   if not(l[j+1]<wmn or l[j]>wmx):

testing/vcs/CMakeLists.txt

@@ -581,6 +581,11 @@ cdat_add_test(vcs_test_taylor_2_quads
       ${BASELINE_DIR}/test_vcs_issue_960_labels_1.png
       ${BASELINE_DIR}/test_vcs_issue_960_labels_2.png
       )
+    cdat_add_test(vcs_test_animate_meshfill
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_animate_meshfill.py
+      ${BASELINE_DIR}
+      )
     cdat_add_test(vcs_test_animate_isofill
       "${PYTHON_EXECUTABLE}"
       ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isofill.py

testing/vcs/test_animate_meshfill.py

@@ -0,0 +1,45 @@
+import vcs
+import cdms2
+import os
+import sys
+import MV2
+
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+
+f=cdms2.open(os.path.join(vcs.prefix,"sample_data","sampleCurveGrid4.nc"))
+s=f("sample")
+print s.shape
+
+s2=MV2.resize(s,(4,32,48))
+t=cdms2.createAxis(range(4))
+t.units="months since 2015"
+t.id="time"
+t.designateTime()
+s2.setAxis(0,t)
+s2.setAxis(1,s.getAxis(0))
+s2.setAxis(2,s.getAxis(1))
+s2.setGrid(s.getGrid())
+for i in range(4):
+    s2[i]=s2[i]*(1+float(i)/10.)
+x=vcs.init()
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+gm=x.createmeshfill()
+x.plot(s2,gm,bg=1)
+x.animate.create()
+prefix= os.path.split(__file__)[1][:-3]
+x.animate.save("%s.mp4"%prefix)
+pngs = x.animate.close(preserve_pngs = True) # so we can look at them again
+src_pth = sys.argv[1]
+pth = os.path.join(src_pth,prefix)
+ret = 0
+for p in pngs:
+  print "Checking:",p
+  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+if ret == 0:
+    os.removedirs(os.path.split(p)[0])
+    os.remove("%s.mp4" % prefix)
+sys.exit(ret)