From b8ce4395ad7dc2614613f743009afa9b086d6cc3 Mon Sep 17 00:00:00 2001 From: Cory Quammen Date: Wed, 31 Oct 2018 23:35:53 -0400 Subject: [PATCH] Add Invert option to Threshold Filter Also modified Threshold.xml test to exercise the new option. --- Applications/ParaView/Testing/XML/CMakeLists.txt | 2 +- Applications/ParaView/Testing/XML/Threshold.xml | 4 ++++ Documentation/release/dev/threshold-invert-option.md | 3 +++ .../ServerManager/SMApplication/Resources/filters.xml | 10 ++++++++++ Testing/Data/Baseline/ThresholdInvert.png.sha512 | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Documentation/release/dev/threshold-invert-option.md create mode 100644 Testing/Data/Baseline/ThresholdInvert.png.sha512 diff --git a/Applications/ParaView/Testing/XML/CMakeLists.txt b/Applications/ParaView/Testing/XML/CMakeLists.txt index 10339c0354..281a50cd31 100644 --- a/Applications/ParaView/Testing/XML/CMakeLists.txt +++ b/Applications/ParaView/Testing/XML/CMakeLists.txt @@ -156,6 +156,7 @@ SET (TESTS_WITH_INLINE_COMPARES ${CMAKE_CURRENT_SOURCE_DIR}/SaveLargeScreenshot.xml ${CMAKE_CURRENT_SOURCE_DIR}/Slice.xml ${CMAKE_CURRENT_SOURCE_DIR}/TestIsoVolume.xml + ${CMAKE_CURRENT_SOURCE_DIR}/Threshold.xml ${CMAKE_CURRENT_SOURCE_DIR}/TransferFunctionResetOnVisibilityChange.xml ${CMAKE_CURRENT_SOURCE_DIR}/UpdateTransferFunctionRanges.xml ${CMAKE_CURRENT_SOURCE_DIR}/XYChart.xml @@ -499,7 +500,6 @@ list(APPEND TESTS_WITH_BASELINES ${CMAKE_CURRENT_SOURCE_DIR}/TimeInspector.xml ${CMAKE_CURRENT_SOURCE_DIR}/TimeStepProgressBar.xml ${CMAKE_CURRENT_SOURCE_DIR}/Tessellate.xml - ${CMAKE_CURRENT_SOURCE_DIR}/Threshold.xml ${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo.xml ${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo1.xml ${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo2.xml diff --git a/Applications/ParaView/Testing/XML/Threshold.xml b/Applications/ParaView/Testing/XML/Threshold.xml index c0f6f1d172..02e2003ed8 100644 --- a/Applications/ParaView/Testing/XML/Threshold.xml +++ b/Applications/ParaView/Testing/XML/Threshold.xml @@ -16,4 +16,8 @@ + + + + diff --git a/Documentation/release/dev/threshold-invert-option.md b/Documentation/release/dev/threshold-invert-option.md new file mode 100644 index 0000000000..7a6e07c0a9 --- /dev/null +++ b/Documentation/release/dev/threshold-invert-option.md @@ -0,0 +1,3 @@ +# Threshold filter has new Invert option + +The **Threshold** filter usually extracts cells that fall within lower and upper bounds of a data array. A new **Invert** option instead causes it to extract cells outside the lower and upper bounds. diff --git a/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml b/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml index e13992d0ff..29595d1d56 100644 --- a/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml +++ b/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml @@ -7354,6 +7354,16 @@ array. results. + + + Invert the threshold results. That is, cells that would have been in the + output with this option off are excluded, while cells that would have been excluded from + the output are included. + + diff --git a/Testing/Data/Baseline/ThresholdInvert.png.sha512 b/Testing/Data/Baseline/ThresholdInvert.png.sha512 new file mode 100644 index 0000000000..a7dcda549c --- /dev/null +++ b/Testing/Data/Baseline/ThresholdInvert.png.sha512 @@ -0,0 +1 @@ +6bd8a3546ac58c25448d06dd7ec385021499c9633629a2b96f88ed49abf2cd9c383fa7d9658195705aa21412581ca4240760c8f0f7a6c8a979ba980b907cba62 -- GitLab