Skip to content

Issue 1170 isofill mask #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doutriaux1 merged 2 commits into from
Mar 26, 2015
Merged

Issue 1170 isofill mask #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f2b26
fix #1170
doutriaux1 Mar 25, 2015
5fd29b1
Added test
doutriaux1 Mar 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Packages/vcs/Lib/vcs2vtk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
5 changes: 5 additions & 0 deletions testing/vcs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions testing/vcs/test_vcs_isofill_mask_cell_shift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
⚡