diff --git a/Packages/vcs/Lib/vcs2vtk.py b/Packages/vcs/Lib/vcs2vtk.py index f4ba888387..13e5dde859 100644 --- a/Packages/vcs/Lib/vcs2vtk.py +++ b/Packages/vcs/Lib/vcs2vtk.py @@ -53,18 +53,19 @@ def putMaskOnVTKGrid(data,grid,actorColor=None,cellData=True,deep=True): grid2.SetPointVisibilityArray(nomsk) grid2.GetPointData().SetScalars(imsk) #grid2.SetCellVisibilityArray(imsk) - p2c = vtk.vtkPointDataToCellData() - p2c.SetInputData(grid2) - geoFilter.SetInputConnection(p2c.GetOutputPort()) - #lut.SetTableValue(0,r/100.,g/100.,b/100.,1.) - #lut.SetTableValue(1,r/100.,g/100.,b/100.,0.) + #p2c = vtk.vtkPointDataToCellData() + #p2c.SetInputData(grid2) + #geoFilter.SetInputConnection(p2c.GetOutputPort()) + geoFilter.SetInputData(grid2) + lut.SetTableValue(0,r/100.,g/100.,b/100.,1.) + lut.SetTableValue(1,r/100.,g/100.,b/100.,1.) else: if grid2.IsA("vtkStructuredGrid"): grid2.SetCellVisibilityArray(nomsk) grid2.GetCellData().SetScalars(imsk) geoFilter.SetInputData(grid2) - lut.SetTableValue(0,r/100.,g/100.,b/100.,0.) - lut.SetTableValue(1,r/100.,g/100.,b/100.,1.) + lut.SetTableValue(0,r/100.,g/100.,b/100.,0.) + lut.SetTableValue(1,r/100.,g/100.,b/100.,1.) geoFilter.Update() mapper = vtk.vtkPolyDataMapper() mapper.SetInputData(geoFilter.GetOutput()) diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt index bea9ede269..0f4204e4f0 100644 --- a/testing/vcs/CMakeLists.txt +++ b/testing/vcs/CMakeLists.txt @@ -253,6 +253,11 @@ cdat_add_test(vcs_test_taylor_2_quads # These test actually plot things need sample data if (CDAT_DOWNLOAD_SAMPLE_DATA) + cdat_add_test(test_vcs_isofill_mask_cell_shift + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py + ${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png + ) cdat_add_test(vcs_test_bad_time_units "${PYTHON_EXECUTABLE}" ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py diff --git a/testing/vcs/test_vcs_isofill_mask_cell_shift.py b/testing/vcs/test_vcs_isofill_mask_cell_shift.py new file mode 100644 index 0000000000..0316b71ac3 --- /dev/null +++ b/testing/vcs/test_vcs_isofill_mask_cell_shift.py @@ -0,0 +1,24 @@ +import os,sys +import MV2 +import vcs +import cdms2 +src=sys.argv[1] +pth = os.path.join(os.path.dirname(__file__),"..") +sys.path.append(pth) +import checkimage +x=vcs.init() +x.drawlogooff() + +x.setbgoutputdimensions(1200,1091,units="pixels") + +f=cdms2.open(os.path.join(sys.prefix,"sample_data","clt.nc")) +s=f("clt",slice(0,1),latitude=(30,70),longitude=(-130,-60)) +s2=MV2.masked_greater(s,65.) + +x.plot(s2,"default","isofill",bg=1) +fnm = "test_vcs_isofill_mask_cell_shift.png" +x.png(fnm) +print "fnm:",fnm +print "src:",src +ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold) +sys.exit(ret)