Merge pull request #874 from UV-CDAT/issue_873_meshfill_missing

meshfill missing is now respected

Author: David Lonie

Packages/vcs/Lib/VTKPlots.py

@@ -985,6 +985,9 @@ def plot2D(self,data1,data2,tmpl,gm):
       mapper.SetScalarRange(lmn,lmx)
 
     if missingMapper is not None:
+      if isinstance(gm,meshfill.Gfm):
+        mappers.append(missingMapper)
+      else:
         mappers.insert(0,missingMapper)
 
     x1,x2,y1,y2 = vcs2vtk.getRange(gm,xm,xM,ym,yM)

Packages/vcs/Lib/vcs2vtk.py

@@ -59,10 +59,10 @@ def putMaskOnVTKGrid(data,grid,actorColor=None,cellData=True,deep=True):
           lut.SetNumberOfTableValues(1)
           r,g,b = actorColor
           lut.SetNumberOfTableValues(2)
-          lut.SetTableValue(0,r/100.,g/100.,b/100.)
-          lut.SetTableValue(1,r/100.,g/100.,b/100.)
+          lut.SetTableValue(0,r/100.,g/100.,b/100.,1.)
+          lut.SetTableValue(1,r/100.,g/100.,b/100.,0.)
           mapper.SetLookupTable(lut)
-          mapper.SetScalarRange(1,1)
+          mapper.SetScalarRange(0,1)
       if grid.IsA("vtkStructuredGrid"):
         if not cellData:
           grid.SetPointVisibilityArray(msk)