From 3be56252da72fce26ea9c49160e5aecd64356dd2 Mon Sep 17 00:00:00 2001 From: amaclean Date: Fri, 17 Apr 2026 14:51:49 +1000 Subject: [PATCH 1/9] IndividualVRML cannot run teapot.wrl, utah_teapot.wrl is added for testing purposes --- src/Cxx/IO/IndividualVRML.cxx | 5 ----- src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png | 4 ++-- src/Testing/Baseline/Cxx/IO/TestIndividualVRML.png | 4 ++-- .../Baseline/PythonicAPI/Animation/TestAnimationScene.png | 4 ++-- src/Testing/Data/utah_teapot.obj | 3 +++ src/Testing/Data/utah_teapot.wrl | 3 +++ 6 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 src/Testing/Data/utah_teapot.obj create mode 100644 src/Testing/Data/utah_teapot.wrl diff --git a/src/Cxx/IO/IndividualVRML.cxx b/src/Cxx/IO/IndividualVRML.cxx index d484f9c7ddb..db1545badc6 100644 --- a/src/Cxx/IO/IndividualVRML.cxx +++ b/src/Cxx/IO/IndividualVRML.cxx @@ -41,11 +41,6 @@ int main(int argc, char* argv[]) // VRML Import. vtkNew importer; importer->SetFileName(filename.c_str()); -#ifdef USE_IMPORTER_UPDATE - importer->Update(); -#else - importer->Read(); -#endif importer->SetRenderWindow(renderWindow); importer->Update(); diff --git a/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png b/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png index b29312c8d94..f2966eed915 100644 --- a/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png +++ b/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726937fffe17896033557f676107e648eb9e2882ba836dbbd48d272a7958d1c5 -size 31560 +oid sha256:44c32fe7ff918f0c2bf8c4a49169009f7299b54e2f5d4bef6d0de04a39dd043a +size 28457 diff --git a/src/Testing/Baseline/Cxx/IO/TestIndividualVRML.png b/src/Testing/Baseline/Cxx/IO/TestIndividualVRML.png index fda7fb0c449..36bed3fc8a9 100644 --- a/src/Testing/Baseline/Cxx/IO/TestIndividualVRML.png +++ b/src/Testing/Baseline/Cxx/IO/TestIndividualVRML.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6720d2ad999b9c2b2a48bc6578ed49142facb000709bcd19bedba19cdb9f4788 -size 20986 +oid sha256:d09b716c476402ece85708224e0fd322da88cb3d63f6664117dd0b5f4012439a +size 18397 diff --git a/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png b/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png index b29312c8d94..d24dca0660e 100644 --- a/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png +++ b/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726937fffe17896033557f676107e648eb9e2882ba836dbbd48d272a7958d1c5 -size 31560 +oid sha256:a5537278ff8158907a3bfbc5b2e513d2da1ec86ed939858b548f826d3b83ec78 +size 30234 diff --git a/src/Testing/Data/utah_teapot.obj b/src/Testing/Data/utah_teapot.obj new file mode 100644 index 00000000000..efca151da09 --- /dev/null +++ b/src/Testing/Data/utah_teapot.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45bd6f962ad4fcf406da8ca2cfc3cc123934595074987298df0db0a74781d4a3 +size 2591232 diff --git a/src/Testing/Data/utah_teapot.wrl b/src/Testing/Data/utah_teapot.wrl new file mode 100644 index 00000000000..64d6153923d --- /dev/null +++ b/src/Testing/Data/utah_teapot.wrl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f48250c84cdaaf8802de06f1c39cff4f77b2a26925bd9661bd462d8c8c0c580 +size 3083922 -- GitLab From 1cc2f7d14a575871c953fea9bb5e27c0fc3c8d37 Mon Sep 17 00:00:00 2001 From: amaclean Date: Fri, 17 Apr 2026 14:53:17 +1000 Subject: [PATCH 2/9] Update CMakeLists.txt for SSIM --- CMakeLists.txt | 8 ++++++++ src/Cxx/Graphs/CMakeLists.txt | 4 ++-- src/Cxx/IO/CMakeLists.txt | 7 ++++++- src/Cxx/Images/CMakeLists.txt | 2 +- src/Cxx/InfoVis/CMakeLists.txt | 2 +- src/Cxx/Plotting/CMakeLists.txt | 2 +- src/Cxx/Points/CMakeLists.txt | 2 +- src/Cxx/Visualization/CMakeLists.txt | 2 +- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c3776d8e59..823857babbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,14 @@ set(CMAKE_MODULE_PATH ${VTK_CMAKE_DIR} ) +#----------------------------------------------------------------------------- +# See: https://docs.vtk.org/en/latest/release_details/9.4/image-testing-framework.html +set(DEFAULT_USE_SSIM_IMAGE_COMP CACHE BOOL ON) +if(DEFAULT_USE_SSIM_IMAGE_COMP) + set(VTK_TESTING_IMAGE_COMPARE_METHOD "TIGHT_VALID") + message(STATUS "SSIM comparison method: ${VTK_TESTING_IMAGE_COMPARE_METHOD}") +endif() + #----------------------------------------------------------------------------- # if (VTK_VERSION VERSION_LESS "8.90.0") # include(WikiModuleConfigLegacy) diff --git a/src/Cxx/Graphs/CMakeLists.txt b/src/Cxx/Graphs/CMakeLists.txt index cf2827b2ef4..7587c3ce4b3 100644 --- a/src/Cxx/Graphs/CMakeLists.txt +++ b/src/Cxx/Graphs/CMakeLists.txt @@ -76,6 +76,6 @@ if (BUILD_TESTING) if (BUILD_TESTING) set(KIT Graphs) - set_tests_properties(${KIT}-SelectedVerticesAndEdges PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") - set_tests_properties(${KIT}-SelectedVerticesAndEdgesObserver PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-SelectedVerticesAndEdges PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-SelectedVerticesAndEdgesObserver PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/IO/CMakeLists.txt b/src/Cxx/IO/CMakeLists.txt index d52447a331b..13dde690c77 100644 --- a/src/Cxx/IO/CMakeLists.txt +++ b/src/Cxx/IO/CMakeLists.txt @@ -176,7 +176,7 @@ if (BUILD_TESTING) TestImportToExport ${DATA}/iflamingo.3ds iflamingo.obj) add_test(${KIT}-IndividualVRML ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests - TestIndividualVRML ${DATA}/teapot.wrl teapot) + TestIndividualVRML ${DATA}/utah_teapot.wrl teapot) add_test(${KIT}-ImageReader2Factory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests TestImageReader2Factory ${DATA}/Gourds.png) @@ -323,3 +323,8 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() + +if (BUILD_TESTING) + set(KIT IO) + # set_tests_properties(${KIT}-IndividualVRML PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") +endif() diff --git a/src/Cxx/Images/CMakeLists.txt b/src/Cxx/Images/CMakeLists.txt index 90a893a6d26..bd65af85620 100644 --- a/src/Cxx/Images/CMakeLists.txt +++ b/src/Cxx/Images/CMakeLists.txt @@ -221,5 +221,5 @@ endif() if (BUILD_TESTING) set(KIT Images) - set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt index 28a25881b90..0f2da36a646 100644 --- a/src/Cxx/InfoVis/CMakeLists.txt +++ b/src/Cxx/InfoVis/CMakeLists.txt @@ -119,5 +119,5 @@ endif() if (BUILD_TESTING) set(KIT InfoVis) - set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Plotting/CMakeLists.txt b/src/Cxx/Plotting/CMakeLists.txt index 85ed355af0f..7e526611397 100644 --- a/src/Cxx/Plotting/CMakeLists.txt +++ b/src/Cxx/Plotting/CMakeLists.txt @@ -76,5 +76,5 @@ endif() if (BUILD_TESTING) set(KIT Plotting) - set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Points/CMakeLists.txt b/src/Cxx/Points/CMakeLists.txt index 7ed4517b551..b8b8b3b064c 100644 --- a/src/Cxx/Points/CMakeLists.txt +++ b/src/Cxx/Points/CMakeLists.txt @@ -104,5 +104,5 @@ endif() if (BUILD_TESTING) set(KIT Points) - set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Visualization/CMakeLists.txt b/src/Cxx/Visualization/CMakeLists.txt index cd5ba7e4e20..d03653adc51 100644 --- a/src/Cxx/Visualization/CMakeLists.txt +++ b/src/Cxx/Visualization/CMakeLists.txt @@ -272,5 +272,5 @@ endif() if (BUILD_TESTING) set(KIT Visualization) - set_tests_properties(${KIT}-Kitchen PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-Kitchen PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() -- GitLab From 1aa54eda86e7adbfe863e7191cb5485a26528ab6 Mon Sep 17 00:00:00 2001 From: amaclean Date: Sat, 18 Apr 2026 16:17:48 +1000 Subject: [PATCH 3/9] Fixing SSM comparison commands --- CMakeLists.txt | 4 ++-- src/Cxx/Animation/CMakeLists.txt | 5 +++++ src/Cxx/Graphs/CMakeLists.txt | 3 ++- src/Cxx/Images/CMakeLists.txt | 2 +- src/Cxx/InfoVis/CMakeLists.txt | 2 +- src/Cxx/Plotting/CMakeLists.txt | 2 +- src/Cxx/Points/CMakeLists.txt | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 823857babbe..4c5a0f044b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,9 +60,9 @@ set(CMAKE_MODULE_PATH #----------------------------------------------------------------------------- # See: https://docs.vtk.org/en/latest/release_details/9.4/image-testing-framework.html -set(DEFAULT_USE_SSIM_IMAGE_COMP CACHE BOOL ON) +option(DEFAULT_USE_SSIM_IMAGE_COMP "SSIM comparison" ON) if(DEFAULT_USE_SSIM_IMAGE_COMP) - set(VTK_TESTING_IMAGE_COMPARE_METHOD "TIGHT_VALID") + set(VTK_TESTING_IMAGE_COMPARE_METHOD "TIGHT_VALID" CACHE STRING "SSIM comparison method") message(STATUS "SSIM comparison method: ${VTK_TESTING_IMAGE_COMPARE_METHOD}") endif() diff --git a/src/Cxx/Animation/CMakeLists.txt b/src/Cxx/Animation/CMakeLists.txt index 1acc7b6c1da..02b6f999e17 100644 --- a/src/Cxx/Animation/CMakeLists.txt +++ b/src/Cxx/Animation/CMakeLists.txt @@ -38,3 +38,8 @@ if (BUILD_TESTING) set(KIT Animation) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif () + +if (BUILD_TESTING) + set(KIT Animation) + # set_tests_properties(${KIT}-AnimationScene PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") +endif() diff --git a/src/Cxx/Graphs/CMakeLists.txt b/src/Cxx/Graphs/CMakeLists.txt index 7587c3ce4b3..3aa21030eb4 100644 --- a/src/Cxx/Graphs/CMakeLists.txt +++ b/src/Cxx/Graphs/CMakeLists.txt @@ -71,8 +71,9 @@ if (BUILD_TESTING) set(KIT Graphs) set(NEEDS_ARGS ) - endif() + include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) +endif() if (BUILD_TESTING) set(KIT Graphs) diff --git a/src/Cxx/Images/CMakeLists.txt b/src/Cxx/Images/CMakeLists.txt index bd65af85620..90a893a6d26 100644 --- a/src/Cxx/Images/CMakeLists.txt +++ b/src/Cxx/Images/CMakeLists.txt @@ -221,5 +221,5 @@ endif() if (BUILD_TESTING) set(KIT Images) - # set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt index 0f2da36a646..e87a7c6afe8 100644 --- a/src/Cxx/InfoVis/CMakeLists.txt +++ b/src/Cxx/InfoVis/CMakeLists.txt @@ -119,5 +119,5 @@ endif() if (BUILD_TESTING) set(KIT InfoVis) - # set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID;THRESHOLD=0.01") endif() diff --git a/src/Cxx/Plotting/CMakeLists.txt b/src/Cxx/Plotting/CMakeLists.txt index 7e526611397..85ed355af0f 100644 --- a/src/Cxx/Plotting/CMakeLists.txt +++ b/src/Cxx/Plotting/CMakeLists.txt @@ -76,5 +76,5 @@ endif() if (BUILD_TESTING) set(KIT Plotting) - # set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Points/CMakeLists.txt b/src/Cxx/Points/CMakeLists.txt index b8b8b3b064c..7ed4517b551 100644 --- a/src/Cxx/Points/CMakeLists.txt +++ b/src/Cxx/Points/CMakeLists.txt @@ -104,5 +104,5 @@ endif() if (BUILD_TESTING) set(KIT Points) - # set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() -- GitLab From c6afa5c953edcbaeeec8bd17e9454189be692f83 Mon Sep 17 00:00:00 2001 From: amaclean Date: Sun, 19 Apr 2026 16:22:37 +1000 Subject: [PATCH 4/9] Replacing images as a result of SSIM TIGHT_VALID testing Commenting out set_tests_properties as all image tests now pass in Linux --- src/Cxx/Images/CMakeLists.txt | 2 +- src/Cxx/InfoVis/CMakeLists.txt | 2 +- src/Cxx/Plotting/CMakeLists.txt | 2 +- src/Cxx/Points/CMakeLists.txt | 2 +- src/Cxx/Visualization/CloseWindow.cxx | 4 ++-- src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png | 4 ++-- .../Baseline/Cxx/GeometricObjects/TestConvexPointSet.png | 4 ++-- src/Testing/Baseline/Cxx/GeometricObjects/TestHexahedron.png | 4 ++-- src/Testing/Baseline/Cxx/GeometricObjects/TestPoint.png | 4 ++-- src/Testing/Baseline/Cxx/ImageData/TestVoxelsOnBoundary.png | 4 ++-- src/Testing/Baseline/Cxx/Images/TestImageFFT.png | 4 ++-- src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png | 4 ++-- .../Baseline/Cxx/Meshes/TestInterpolateFieldDataDemo.png | 4 ++-- src/Testing/Baseline/Cxx/Modelling/TestDelaunay3D.png | 4 ++-- .../Baseline/Cxx/PolyData/TestEmbedPointsIntoVolume.png | 4 ++-- .../Baseline/Cxx/VisualizationAlgorithms/TestMotor.png | 4 ++-- .../Baseline/PythonicAPI/Animation/TestAnimationScene.png | 4 ++-- .../PythonicAPI/GeometricObjects/TestConvexPointSet.png | 4 ++-- .../Baseline/PythonicAPI/ImageData/TestVoxelsOnBoundary.png | 4 ++-- src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png | 4 ++-- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Cxx/Images/CMakeLists.txt b/src/Cxx/Images/CMakeLists.txt index 90a893a6d26..bd65af85620 100644 --- a/src/Cxx/Images/CMakeLists.txt +++ b/src/Cxx/Images/CMakeLists.txt @@ -221,5 +221,5 @@ endif() if (BUILD_TESTING) set(KIT Images) - set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt index e87a7c6afe8..b3d09d30f4c 100644 --- a/src/Cxx/InfoVis/CMakeLists.txt +++ b/src/Cxx/InfoVis/CMakeLists.txt @@ -119,5 +119,5 @@ endif() if (BUILD_TESTING) set(KIT InfoVis) - set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID;THRESHOLD=0.01") + # set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID;THRESHOLD=0.01") endif() diff --git a/src/Cxx/Plotting/CMakeLists.txt b/src/Cxx/Plotting/CMakeLists.txt index 85ed355af0f..7e526611397 100644 --- a/src/Cxx/Plotting/CMakeLists.txt +++ b/src/Cxx/Plotting/CMakeLists.txt @@ -76,5 +76,5 @@ endif() if (BUILD_TESTING) set(KIT Plotting) - set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Points/CMakeLists.txt b/src/Cxx/Points/CMakeLists.txt index 7ed4517b551..b8b8b3b064c 100644 --- a/src/Cxx/Points/CMakeLists.txt +++ b/src/Cxx/Points/CMakeLists.txt @@ -104,5 +104,5 @@ endif() if (BUILD_TESTING) set(KIT Points) - set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + # set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Visualization/CloseWindow.cxx b/src/Cxx/Visualization/CloseWindow.cxx index 230c2a335bb..8b300770e7e 100644 --- a/src/Cxx/Visualization/CloseWindow.cxx +++ b/src/Cxx/Visualization/CloseWindow.cxx @@ -51,8 +51,8 @@ int main(int, char*[]) // Render and interact. renderWindow->Render(); renderWindow->SetWindowName("First Window"); + std::cout << "Window 1 opened..." << std::endl; renderWindowInteractor->Start(); - std::cout << "Window 1 closed..." << std::endl; // Make another interactor, but use the same render window. @@ -68,7 +68,7 @@ int main(int, char*[]) renderWindowInteractor2->SetRenderWindow(renderWindow); renderWindow->Render(); renderWindow->SetWindowName("Second Window"); - + std::cout << "Window 2 opened..." << std::endl; renderWindowInteractor2->Start(); std::cout << "Window 2 closed. Exiting..." << std::endl; diff --git a/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png b/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png index f2966eed915..f82904fd619 100644 --- a/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png +++ b/src/Testing/Baseline/Cxx/Animation/TestAnimationScene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44c32fe7ff918f0c2bf8c4a49169009f7299b54e2f5d4bef6d0de04a39dd043a -size 28457 +oid sha256:406050644d8b94cc70d95310c1e77720528a7b1baa70afef2a4535b2754f484a +size 31740 diff --git a/src/Testing/Baseline/Cxx/GeometricObjects/TestConvexPointSet.png b/src/Testing/Baseline/Cxx/GeometricObjects/TestConvexPointSet.png index 88ff92816e1..8e119e025b8 100644 --- a/src/Testing/Baseline/Cxx/GeometricObjects/TestConvexPointSet.png +++ b/src/Testing/Baseline/Cxx/GeometricObjects/TestConvexPointSet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ec122aa87d299478acc947ebe215c2a598876a370655eefb248b0fdab96bd55 -size 18590 +oid sha256:41caeb4dc8be3ea4d9f1662d14a4ed53d6ac38b3af08bc9b0561ff769ae3e7e8 +size 39343 diff --git a/src/Testing/Baseline/Cxx/GeometricObjects/TestHexahedron.png b/src/Testing/Baseline/Cxx/GeometricObjects/TestHexahedron.png index 85d70cb1e1b..883ea3f8d9d 100644 --- a/src/Testing/Baseline/Cxx/GeometricObjects/TestHexahedron.png +++ b/src/Testing/Baseline/Cxx/GeometricObjects/TestHexahedron.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4e27726598397a353df4dec3c470f329f864a620cace8ff4670394d9cd7d68 -size 4165 +oid sha256:18e980694615d01c8a68c536212869ccabd7b3cb130454f481cf30e94ea6a37c +size 3958 diff --git a/src/Testing/Baseline/Cxx/GeometricObjects/TestPoint.png b/src/Testing/Baseline/Cxx/GeometricObjects/TestPoint.png index b3abeb2169f..cad6894a6a1 100644 --- a/src/Testing/Baseline/Cxx/GeometricObjects/TestPoint.png +++ b/src/Testing/Baseline/Cxx/GeometricObjects/TestPoint.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a098a0bd3624009015aae7ba8ef2dc5f3ab57dbe3dc64f18db8a121fd538704 -size 947 +oid sha256:9f3704a09a408169c39709958e58867db21eed0b3a6ea9e77c88f17e76ed7305 +size 937 diff --git a/src/Testing/Baseline/Cxx/ImageData/TestVoxelsOnBoundary.png b/src/Testing/Baseline/Cxx/ImageData/TestVoxelsOnBoundary.png index 4b4e8658a1e..c0f7bb0f432 100644 --- a/src/Testing/Baseline/Cxx/ImageData/TestVoxelsOnBoundary.png +++ b/src/Testing/Baseline/Cxx/ImageData/TestVoxelsOnBoundary.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f22daad092c6e5aaa43cc606e6b4de851496967efbcf476184601684883d5fe3 -size 45926 +oid sha256:4c00a04e1b7fafa382e04d43ec302f04980864cce014aef66617cb345934acda +size 254845 diff --git a/src/Testing/Baseline/Cxx/Images/TestImageFFT.png b/src/Testing/Baseline/Cxx/Images/TestImageFFT.png index 9aff6d9e9b2..176fe69d2c2 100644 --- a/src/Testing/Baseline/Cxx/Images/TestImageFFT.png +++ b/src/Testing/Baseline/Cxx/Images/TestImageFFT.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:579a466b40f7386762f68e14915a437b8223c27b20abf297bcaf0d0a4183208b -size 63417 +oid sha256:59ec88c4ba5b15dedea1b57d290716eb76cddf64b1e7f24c30a8962f1677185d +size 59620 diff --git a/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png b/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png index c68633f5bd8..0deed3fb62b 100644 --- a/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png +++ b/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ab0fdb4d7a80a0908597fa0c5e3ba9194d6df9dd8c6d4cbf197f921b5febdd4 -size 176104 +oid sha256:2cb5284ec5b4bbc26fef749f1e0dd49c8bca5d058fcadc1e12427aaa89a46f8a +size 170041 diff --git a/src/Testing/Baseline/Cxx/Meshes/TestInterpolateFieldDataDemo.png b/src/Testing/Baseline/Cxx/Meshes/TestInterpolateFieldDataDemo.png index 39a949eec58..76602eb9b30 100644 --- a/src/Testing/Baseline/Cxx/Meshes/TestInterpolateFieldDataDemo.png +++ b/src/Testing/Baseline/Cxx/Meshes/TestInterpolateFieldDataDemo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:406552b734ada03531198b8acc357753a35647d57fa33afbb42f1cf89e8458a8 -size 46041 +oid sha256:15d1b19e6fe72b4563d031f594bf192cbce4b31c950716dffebee247823ac40e +size 87699 diff --git a/src/Testing/Baseline/Cxx/Modelling/TestDelaunay3D.png b/src/Testing/Baseline/Cxx/Modelling/TestDelaunay3D.png index 0fb0e28dc85..b2e3e4f620e 100644 --- a/src/Testing/Baseline/Cxx/Modelling/TestDelaunay3D.png +++ b/src/Testing/Baseline/Cxx/Modelling/TestDelaunay3D.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc0d12dc77043ffcc7d7b3b87d9bcaa10643f4a9f10c7611d0067e3100d358f5 -size 61121 +oid sha256:5ac8dd3f17c8e10ec44e55f4926a05d1d51bd1e94d8bc6e7eb4ff533583d0485 +size 61211 diff --git a/src/Testing/Baseline/Cxx/PolyData/TestEmbedPointsIntoVolume.png b/src/Testing/Baseline/Cxx/PolyData/TestEmbedPointsIntoVolume.png index 6b260fcc212..22a21c7fce6 100644 --- a/src/Testing/Baseline/Cxx/PolyData/TestEmbedPointsIntoVolume.png +++ b/src/Testing/Baseline/Cxx/PolyData/TestEmbedPointsIntoVolume.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9fed24e137212eea528ffbce83aa957a2302d6dcfd61d8f5964a3832e493d88 -size 51113 +oid sha256:a00ed34f417731cde13d2e189a186f527bddb5f252cf5241ba9e9e36bacfaa51 +size 51409 diff --git a/src/Testing/Baseline/Cxx/VisualizationAlgorithms/TestMotor.png b/src/Testing/Baseline/Cxx/VisualizationAlgorithms/TestMotor.png index 2578af32c92..fe8f419a361 100644 --- a/src/Testing/Baseline/Cxx/VisualizationAlgorithms/TestMotor.png +++ b/src/Testing/Baseline/Cxx/VisualizationAlgorithms/TestMotor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8dd035d30a0dc074ff1fc4f065484302028cbed52a89bf9f2e198039ade399f -size 95014 +oid sha256:8caf96d9f6beeb0972837efafa3df5b0657f69268a0766dc82b2da1fe181a87f +size 94630 diff --git a/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png b/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png index d24dca0660e..f82904fd619 100644 --- a/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png +++ b/src/Testing/Baseline/PythonicAPI/Animation/TestAnimationScene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5537278ff8158907a3bfbc5b2e513d2da1ec86ed939858b548f826d3b83ec78 -size 30234 +oid sha256:406050644d8b94cc70d95310c1e77720528a7b1baa70afef2a4535b2754f484a +size 31740 diff --git a/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestConvexPointSet.png b/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestConvexPointSet.png index 88ff92816e1..8e119e025b8 100644 --- a/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestConvexPointSet.png +++ b/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestConvexPointSet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ec122aa87d299478acc947ebe215c2a598876a370655eefb248b0fdab96bd55 -size 18590 +oid sha256:41caeb4dc8be3ea4d9f1662d14a4ed53d6ac38b3af08bc9b0561ff769ae3e7e8 +size 39343 diff --git a/src/Testing/Baseline/PythonicAPI/ImageData/TestVoxelsOnBoundary.png b/src/Testing/Baseline/PythonicAPI/ImageData/TestVoxelsOnBoundary.png index 4b4e8658a1e..c0f7bb0f432 100644 --- a/src/Testing/Baseline/PythonicAPI/ImageData/TestVoxelsOnBoundary.png +++ b/src/Testing/Baseline/PythonicAPI/ImageData/TestVoxelsOnBoundary.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f22daad092c6e5aaa43cc606e6b4de851496967efbcf476184601684883d5fe3 -size 45926 +oid sha256:4c00a04e1b7fafa382e04d43ec302f04980864cce014aef66617cb345934acda +size 254845 diff --git a/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png b/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png index 2f041ed5137..0deed3fb62b 100644 --- a/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png +++ b/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4deb5b0707b8922b54bdc61acb9f1279f001f531aa6512e1e0b108970c03c815 -size 18088 +oid sha256:2cb5284ec5b4bbc26fef749f1e0dd49c8bca5d058fcadc1e12427aaa89a46f8a +size 170041 -- GitLab From 7072a3d168798008b5622b7a4f193e767179810a Mon Sep 17 00:00:00 2001 From: amaclean Date: Mon, 20 Apr 2026 14:39:50 +1000 Subject: [PATCH 5/9] Fixing for Windows --- src/Cxx/Animation/CMakeLists.txt | 5 ----- src/Cxx/Graphs/CMakeLists.txt | 6 ------ src/Cxx/IO/CMakeLists.txt | 5 ----- src/Cxx/Images/CMakeLists.txt | 5 ----- src/Cxx/InfoVis/CMakeLists.txt | 5 ----- src/Cxx/Plotting/CMakeLists.txt | 5 ----- src/Cxx/Points/CMakeLists.txt | 2 +- src/Cxx/Visualization/CMakeLists.txt | 5 ----- src/Testing/Baseline/Cxx/Images/TestImageMapper.png | 4 ++-- 9 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/Cxx/Animation/CMakeLists.txt b/src/Cxx/Animation/CMakeLists.txt index 02b6f999e17..1acc7b6c1da 100644 --- a/src/Cxx/Animation/CMakeLists.txt +++ b/src/Cxx/Animation/CMakeLists.txt @@ -38,8 +38,3 @@ if (BUILD_TESTING) set(KIT Animation) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif () - -if (BUILD_TESTING) - set(KIT Animation) - # set_tests_properties(${KIT}-AnimationScene PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Cxx/Graphs/CMakeLists.txt b/src/Cxx/Graphs/CMakeLists.txt index 3aa21030eb4..49a69679576 100644 --- a/src/Cxx/Graphs/CMakeLists.txt +++ b/src/Cxx/Graphs/CMakeLists.txt @@ -74,9 +74,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT Graphs) - # set_tests_properties(${KIT}-SelectedVerticesAndEdges PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") - # set_tests_properties(${KIT}-SelectedVerticesAndEdgesObserver PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Cxx/IO/CMakeLists.txt b/src/Cxx/IO/CMakeLists.txt index 13dde690c77..cc10b874932 100644 --- a/src/Cxx/IO/CMakeLists.txt +++ b/src/Cxx/IO/CMakeLists.txt @@ -323,8 +323,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT IO) - # set_tests_properties(${KIT}-IndividualVRML PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Cxx/Images/CMakeLists.txt b/src/Cxx/Images/CMakeLists.txt index bd65af85620..17a94d222b4 100644 --- a/src/Cxx/Images/CMakeLists.txt +++ b/src/Cxx/Images/CMakeLists.txt @@ -218,8 +218,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT Images) - # set_tests_properties(${KIT}-ImageMapper PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt index b3d09d30f4c..0904d0ea479 100644 --- a/src/Cxx/InfoVis/CMakeLists.txt +++ b/src/Cxx/InfoVis/CMakeLists.txt @@ -116,8 +116,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT InfoVis) - # set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID;THRESHOLD=0.01") -endif() diff --git a/src/Cxx/Plotting/CMakeLists.txt b/src/Cxx/Plotting/CMakeLists.txt index 7e526611397..b9eafa5fdad 100644 --- a/src/Cxx/Plotting/CMakeLists.txt +++ b/src/Cxx/Plotting/CMakeLists.txt @@ -73,8 +73,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT Plotting) - # set_tests_properties(${KIT}-CompareRandomGeneratorsCxx PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Cxx/Points/CMakeLists.txt b/src/Cxx/Points/CMakeLists.txt index b8b8b3b064c..7ed4517b551 100644 --- a/src/Cxx/Points/CMakeLists.txt +++ b/src/Cxx/Points/CMakeLists.txt @@ -104,5 +104,5 @@ endif() if (BUILD_TESTING) set(KIT Points) - # set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") + set_tests_properties(${KIT}-SignedDistance PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") endif() diff --git a/src/Cxx/Visualization/CMakeLists.txt b/src/Cxx/Visualization/CMakeLists.txt index d03653adc51..bb8b4c24a6c 100644 --- a/src/Cxx/Visualization/CMakeLists.txt +++ b/src/Cxx/Visualization/CMakeLists.txt @@ -269,8 +269,3 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() - -if (BUILD_TESTING) - set(KIT Visualization) - # set_tests_properties(${KIT}-Kitchen PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") -endif() diff --git a/src/Testing/Baseline/Cxx/Images/TestImageMapper.png b/src/Testing/Baseline/Cxx/Images/TestImageMapper.png index 7f1b649c311..4a3bbe49bbe 100644 --- a/src/Testing/Baseline/Cxx/Images/TestImageMapper.png +++ b/src/Testing/Baseline/Cxx/Images/TestImageMapper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c873692aefd97c03cc7a1890c60dba2cc09f3ef5d7d107bc14b004ec97a76f82 -size 938 +oid sha256:602eb4c306230775fd45ec6df89d6e4fdb9717bcf332c39a04ae4d98d5c3da72 +size 951 -- GitLab From 3fb4c0fcf4c8de573d9350bb4eee9b9d17ad2093 Mon Sep 17 00:00:00 2001 From: amaclean Date: Mon, 20 Apr 2026 15:51:26 +1000 Subject: [PATCH 6/9] Fixed ImageMapper.cxx, updated TestXGMLReader.png --- src/Cxx/Images/ImageMapper.cxx | 16 ++++++---------- .../Baseline/Cxx/InfoVis/TestXGMLReader.png | 4 ++-- .../PythonicAPI/InfoVis/TestXGMLReader.png | 4 ++-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/Cxx/Images/ImageMapper.cxx b/src/Cxx/Images/ImageMapper.cxx index 10e03e17818..ab59b67c04b 100644 --- a/src/Cxx/Images/ImageMapper.cxx +++ b/src/Cxx/Images/ImageMapper.cxx @@ -65,16 +65,12 @@ void CreateColorImage(vtkImageData* image) { vtkNew colors; - std::array drawColor1{0, 0, 0}; - std::array drawColor2{0, 0, 0}; - auto color1 = colors->GetColor3ub("HotPink").GetData(); - auto color2 = colors->GetColor3ub("Chartreuse").GetData(); - for (auto i = 0; i < 3; ++i) - { - drawColor1[i] = color1[i]; - drawColor2[i] = color2[i]; - } - + auto color1 = colors->GetColor3ub("HotPink"); + std::array drawColor1{color1.GetRed(), color1.GetGreen(), + color1.GetBlue()}; + auto color2 = colors->GetColor3ub("Chartreuse"); + std::array drawColor2{color2.GetRed(), color2.GetGreen(), + color2.GetBlue()}; unsigned int dim = 20; image->SetDimensions(dim, dim, 1); diff --git a/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png b/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png index 0deed3fb62b..c68633f5bd8 100644 --- a/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png +++ b/src/Testing/Baseline/Cxx/InfoVis/TestXGMLReader.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb5284ec5b4bbc26fef749f1e0dd49c8bca5d058fcadc1e12427aaa89a46f8a -size 170041 +oid sha256:4ab0fdb4d7a80a0908597fa0c5e3ba9194d6df9dd8c6d4cbf197f921b5febdd4 +size 176104 diff --git a/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png b/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png index 0deed3fb62b..c68633f5bd8 100644 --- a/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png +++ b/src/Testing/Baseline/PythonicAPI/InfoVis/TestXGMLReader.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb5284ec5b4bbc26fef749f1e0dd49c8bca5d058fcadc1e12427aaa89a46f8a -size 170041 +oid sha256:4ab0fdb4d7a80a0908597fa0c5e3ba9194d6df9dd8c6d4cbf197f921b5febdd4 +size 176104 -- GitLab From bb7dafe80d9527446aa3a0830b7deb8c52683cf5 Mon Sep 17 00:00:00 2001 From: amaclean Date: Tue, 21 Apr 2026 15:38:36 +1000 Subject: [PATCH 7/9] The filename has changed to utah_teapot.wrl --- src/Cxx/IO/IndividualVRML.cxx | 2 +- src/Cxx/Images/ImageMapper.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Cxx/IO/IndividualVRML.cxx b/src/Cxx/IO/IndividualVRML.cxx index db1545badc6..1cece00034f 100644 --- a/src/Cxx/IO/IndividualVRML.cxx +++ b/src/Cxx/IO/IndividualVRML.cxx @@ -22,7 +22,7 @@ int main(int argc, char* argv[]) if (argc != 3) { - std::cout << "Required arguments: Filename Actorname e.g. teapot.wrl teapot" + std::cout << "Required arguments: Filename Actorname e.g. utah_teapot.wrl teapot" << std::endl; return EXIT_FAILURE; } diff --git a/src/Cxx/Images/ImageMapper.cxx b/src/Cxx/Images/ImageMapper.cxx index ab59b67c04b..4d0417711de 100644 --- a/src/Cxx/Images/ImageMapper.cxx +++ b/src/Cxx/Images/ImageMapper.cxx @@ -71,6 +71,7 @@ void CreateColorImage(vtkImageData* image) auto color2 = colors->GetColor3ub("Chartreuse"); std::array drawColor2{color2.GetRed(), color2.GetGreen(), color2.GetBlue()}; + unsigned int dim = 20; image->SetDimensions(dim, dim, 1); -- GitLab From ec5e902cd6fd95932617fcf5a811db8459444499 Mon Sep 17 00:00:00 2001 From: amaclean Date: Tue, 28 Apr 2026 10:07:29 +1000 Subject: [PATCH 8/9] Adding PROPERTIES ENVIRONMENT to ExamplesTesting.cmake --- CMake/ExamplesTesting.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMake/ExamplesTesting.cmake b/CMake/ExamplesTesting.cmake index 1f75f6dc034..d39f8b3d4bc 100644 --- a/CMake/ExamplesTesting.cmake +++ b/CMake/ExamplesTesting.cmake @@ -24,7 +24,10 @@ foreach(SOURCE_FILE ${ALL_FILES}) if(SKIP_ADD EQUAL -1) add_test(${KIT}-${EXAMPLE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests Test${EXAMPLE}) endif() - set_property(TEST ${KIT}-${EXAMPLE} PROPERTY LABELS WikiExamples) + set_property(TEST ${KIT}-${EXAMPLE} + PROPERTY LABELS WikiExamples + PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" + ) endif() endforeach() set(VTK_BINARY_DIR ${WikiExamples_BINARY_DIR}) @@ -39,4 +42,4 @@ if (VTK_VERSION VERSION_GREATER "8.8") MODULES ${VTK_LIBRARIES} ) endif() -endif() \ No newline at end of file +endif() -- GitLab From 41f2d0d6d351f18fe48c498b88d612eca5ede2b4 Mon Sep 17 00:00:00 2001 From: amaclean Date: Thu, 30 Apr 2026 10:04:18 +1000 Subject: [PATCH 9/9] Adding comment regarding XGMLReader --- src/Cxx/InfoVis/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt index 0904d0ea479..2115fdb5341 100644 --- a/src/Cxx/InfoVis/CMakeLists.txt +++ b/src/Cxx/InfoVis/CMakeLists.txt @@ -116,3 +116,9 @@ if (BUILD_TESTING) include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake) endif() + +if (BUILD_TESTING) + set(KIT InfoVis) + # This still fails in Windows TIGHT_VALID is Ok in Linux. + set_tests_properties(${KIT}-XGMLReader PROPERTIES ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=LEGACY_VALID") +endif() -- GitLab