From af3640d9324b593493aa4312f4088ade6037c27f Mon Sep 17 00:00:00 2001 From: Tushar Athawale Date: Tue, 9 Aug 2022 16:26:12 -0400 Subject: [PATCH 1/2] Adding new data to tutorial examples --- tutorial/CMakeLists.txt | 2 ++ tutorial/contour.cxx | 11 +++++------ tutorial/data/skull.vtk | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 tutorial/data/skull.vtk diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index ac6368a88..1f7e69be1 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -67,3 +67,5 @@ vtkm_add_target_information(extract_edges # Copy the data file to be adjacent to the binaries file(GENERATE OUTPUT "$/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk") + +file(GENERATE OUTPUT "$/data/skull.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/skull.vtk") diff --git a/tutorial/contour.cxx b/tutorial/contour.cxx index cd6911a30..f1e315cef 100644 --- a/tutorial/contour.cxx +++ b/tutorial/contour.cxx @@ -18,15 +18,14 @@ int main(int argc, char** argv) { vtkm::cont::Initialize(argc, argv); - vtkm::io::VTKDataSetReader reader("data/kitchen.vtk"); + vtkm::io::VTKDataSetReader reader("data/skull.vtk"); vtkm::cont::DataSet ds_from_file = reader.ReadDataSet(); vtkm::filter::contour::Contour contour; - contour.SetActiveField("c1"); - contour.SetNumberOfIsoValues(3); - contour.SetIsoValue(0, 0.05); - contour.SetIsoValue(1, 0.10); - contour.SetIsoValue(2, 0.15); + contour.SetActiveField("Scalars_"); + contour.SetNumberOfIsoValues(1); + contour.SetIsoValue(0, 2000); + contour.SetGenerateNormals(true); vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file); vtkm::io::VTKDataSetWriter writer("out_mc.vtk"); diff --git a/tutorial/data/skull.vtk b/tutorial/data/skull.vtk new file mode 100644 index 000000000..0985556e6 --- /dev/null +++ b/tutorial/data/skull.vtk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084c919cf28c100ac67e50a0ad529380d0635891e8a11a953a88776900e7ef8a +size 24256465 From bb8d52f9c45e135e076fb0cf0f81cec66b96985e Mon Sep 17 00:00:00 2001 From: Tushar Athawale Date: Wed, 13 Sep 2023 04:56:40 -0400 Subject: [PATCH 2/2] Tutorial files restored --- tutorial/CMakeLists.txt | 2 ++ tutorial/contour.cxx | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index 1f7e69be1..f597f6f89 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -69,3 +69,5 @@ vtkm_add_target_information(extract_edges file(GENERATE OUTPUT "$/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk") file(GENERATE OUTPUT "$/data/skull.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/skull.vtk") + +file(GENERATE OUTPUT "$/data/raw_data.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/raw_data.vtk") diff --git a/tutorial/contour.cxx b/tutorial/contour.cxx index f1e315cef..b5bbd72a6 100644 --- a/tutorial/contour.cxx +++ b/tutorial/contour.cxx @@ -18,13 +18,13 @@ int main(int argc, char** argv) { vtkm::cont::Initialize(argc, argv); - vtkm::io::VTKDataSetReader reader("data/skull.vtk"); + vtkm::io::VTKDataSetReader reader("data/raw_data.vtk"); vtkm::cont::DataSet ds_from_file = reader.ReadDataSet(); vtkm::filter::contour::Contour contour; - contour.SetActiveField("Scalars_"); + contour.SetActiveField("ground_truth"); contour.SetNumberOfIsoValues(1); - contour.SetIsoValue(0, 2000); + contour.SetIsoValue(0, 1500); contour.SetGenerateNormals(true); vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);