diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 0922c72a1b..8243950b49 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -49,7 +49,7 @@ OSInformation() message(STATUS "* -------------- Dependent Libraries -------------------------------------------") message(STATUS "* Eigen (${Eigen3_VERSION}) ${Eigen3_DIR}") message(STATUS "* HDF5 (${HDF5_VERSION}) ${HDF5_INSTALL}") -message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}") +# message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}") message(STATUS "* Pybind11 (${pybind11_VERSION}) ${pybind11_DIR}") message(STATUS "* TBB (${TBB_VERSION}) ${TBB_DIR}") message(STATUS "* fmt (${fmt_VERSION}) ${fmt_DIR}") @@ -77,6 +77,7 @@ message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}") message(STATUS "* COMPLEX_BUILD_PYTHON: ${COMPLEX_BUILD_PYTHON}") message(STATUS "* COMPLEX_EMBED_PYTHON: ${COMPLEX_EMBED_PYTHON}") message(STATUS "* COMPLEX_ENABLE_SPHINX_DOCS: ${COMPLEX_ENABLE_SPHINX_DOCS}") +message(STATUS "* COMPLEX_CONDA_BUILD: ${COMPLEX_CONDA_BUILD}") # message(STATUS "* -------------- Known Plugins ------------------------------------------------------") # foreach(plugin ${COMPLEX_PLUGIN_LIST}) diff --git a/src/Plugins/ITKImageProcessing/CMakeLists.txt b/src/Plugins/ITKImageProcessing/CMakeLists.txt index 98eeaefd32..73a4d4d633 100644 --- a/src/Plugins/ITKImageProcessing/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/CMakeLists.txt @@ -53,6 +53,8 @@ if(NOT GENERATOR_IS_MULTI_CONFIG) set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${ITK_LIB_DIR}) endif() +message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}") + include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") set(PLUGIN_NAME "ITKImageProcessing") @@ -76,6 +78,27 @@ set(FilterList set(AlgorithmList ) +if(NOT COMPLEX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) + list(APPEND FilterList + ITKBinaryContourImage + ITKBinaryOpeningByReconstructionImage + ITKClosingByReconstructionImage + ITKGrayscaleFillholeImage + ITKGrayscaleGrindPeakImage + ITKHConvexImage + ITKHMaximaImage + ITKHMinimaImage + ITKLabelContourImage + ITKMorphologicalGradientImage + ITKMorphologicalWatershedImage + ITKOpeningByReconstructionImage + ITKSignedMaurerDistanceMapImage + ITKValuedRegionalMaximaImage + ITKValuedRegionalMinimaImage +) + endif() + + # ------------------------------------------------------------------------------ # These are all extra filters that are built if we have enabled all the filters # @@ -86,17 +109,14 @@ if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ITKAdaptiveHistogramEqualizationImage ITKAsinImage ITKAtanImage - ITKBinaryContourImage ITKBinaryDilateImage ITKBinaryErodeImage ITKBinaryMorphologicalClosingImage ITKBinaryMorphologicalOpeningImage - ITKBinaryOpeningByReconstructionImage ITKBinaryProjectionImage ITKBinaryThinningImage ITKBinaryThresholdImage ITKBlackTopHatImage - ITKClosingByReconstructionImage ITKCosImage ITKDilateObjectMorphologyImage ITKErodeObjectMorphologyImage @@ -105,36 +125,24 @@ if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ITKGradientMagnitudeImage ITKGrayscaleDilateImage ITKGrayscaleErodeImage - ITKGrayscaleFillholeImage - ITKGrayscaleGrindPeakImage ITKGrayscaleMorphologicalClosingImage ITKGrayscaleMorphologicalOpeningImage - ITKHConvexImage - ITKHMaximaImage - ITKHMinimaImage ITKIntensityWindowingImage ITKInvertIntensityImage ITKImportFijiMontageFilter - ITKLabelContourImage ITKLog10Image ITKLogImage ITKMaskImage - ITKMorphologicalGradientImage - ITKMorphologicalWatershedImage ITKNormalizeImage ITKNotImage - ITKOpeningByReconstructionImage ITKOtsuMultipleThresholdsImage ITKRelabelComponentImage ITKSigmoidImage - ITKSignedMaurerDistanceMapImage ITKSinImage ITKSqrtImage ITKSquareImage ITKTanImage ITKThresholdImage - ITKValuedRegionalMaximaImage - ITKValuedRegionalMinimaImage ITKWhiteTopHatImage # ----------------------------------------------------------------------------- diff --git a/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in b/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in index 8c144c68f0..9624e694ab 100644 --- a/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in +++ b/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in @@ -1,3 +1,5 @@ #pragma once #cmakedefine ITKIMAGEPROCESSING_LEAN_AND_MEAN + +#cmakedefine COMPLEX_CONDA_BUILD diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp index 2ee39bdfe5..e0dfe28624 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp @@ -20,7 +20,7 @@ namespace itk class Dream3DFilterInterruption : public Command { public: - ITK_DISALLOW_COPY_AND_ASSIGN(Dream3DFilterInterruption); + ITK_DISALLOW_COPY_AND_MOVE(Dream3DFilterInterruption); /** Standard class type aliases. */ using Self = Dream3DFilterInterruption; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp index 317bfb2b48..73be8a2050 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp @@ -10,7 +10,7 @@ Result ReadImagePreflight(const std::string& fileName, DataPath i try { - itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::ImageIOFactory::ReadMode); + itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::CommonEnums::IOFileMode::ReadMode); if(imageIO == nullptr) { return MakeErrorResult(-5, fmt::format("ITK could not read the given file \"{}\". Format is likely unsupported.", fileName)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp index c3850d38ce..8cc322aa91 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp @@ -108,7 +108,7 @@ Result<> ReadImageExecute(const std::string& fileName, ArgsT&&... args) { try { - itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::ImageIOFactory::ReadMode); + itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::CommonEnums::IOFileMode::ReadMode); if(imageIO == nullptr) { return MakeErrorResult(-5, fmt::format("ITK could not read the given file \"{}\". Format is likely unsupported.", fileName)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp index 9fe210146c..d85971b546 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp @@ -142,8 +142,8 @@ itk::FlatStructuringElement CreateKernel(KernelEnum kernelType, const { size.push_back(static_cast(f)); } - typedef itk::FlatStructuringElement StructuringElementType; - typedef typename StructuringElementType::RadiusType RadiusType; + using StructuringElementType = itk::FlatStructuringElement; + using RadiusType = typename StructuringElementType::RadiusType; RadiusType elementRadius; if(RadiusType::Dimension > 0) { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp index af81ea8770..6f9327f956 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp @@ -14,33 +14,43 @@ // clang-format off #ifndef ITKIMAGEPROCESSING_LEAN_AND_MEAN +#ifndef COMPLEX_CONDA_BUILD +#include "ITKImageProcessing/Filters/ITKBinaryContourImage.hpp" +#include "ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp" +#include "ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp" +#include "ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp" +#include "ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp" +#include "ITKImageProcessing/Filters/ITKHConvexImage.hpp" +#include "ITKImageProcessing/Filters/ITKHMaximaImage.hpp" +#include "ITKImageProcessing/Filters/ITKHMinimaImage.hpp" +#include "ITKImageProcessing/Filters/ITKLabelContourImage.hpp" +#include "ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp" +#include "ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp" +#include "ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp" +#include "ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp" +#include "ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp" +#include "ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp" +#endif #include "ITKImageProcessing/Filters/ITKAbsImage.hpp" #include "ITKImageProcessing/Filters/ITKAcosImage.hpp" #include "ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp" #include "ITKImageProcessing/Filters/ITKAsinImage.hpp" #include "ITKImageProcessing/Filters/ITKAtanImage.hpp" -#include "ITKImageProcessing/Filters/ITKBinaryContourImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp" -#include "ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp" #include "ITKImageProcessing/Filters/ITKCosImage.hpp" #include "ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp" -#include "ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp" #include "ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp" #include "ITKImageProcessing/Filters/ITKLog10Image.hpp" #include "ITKImageProcessing/Filters/ITKLogImage.hpp" #include "ITKImageProcessing/Filters/ITKMaskImage.hpp" -#include "ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp" #include "ITKImageProcessing/Filters/ITKNormalizeImage.hpp" -#include "ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp" #include "ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp" -#include "ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp" #include "ITKImageProcessing/Filters/ITKSinImage.hpp" #include "ITKImageProcessing/Filters/ITKSqrtImage.hpp" #include "ITKImageProcessing/Filters/ITKTanImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp" -#include "ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp" #include "ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp" @@ -50,22 +60,14 @@ #include "ITKImageProcessing/Filters/ITKExpNegativeImage.hpp" #include "ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp" #include "ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp" -#include "ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp" #include "ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp" #include "ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp" -#include "ITKImageProcessing/Filters/ITKHConvexImage.hpp" -#include "ITKImageProcessing/Filters/ITKHMaximaImage.hpp" -#include "ITKImageProcessing/Filters/ITKHMinimaImage.hpp" #include "ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp" -#include "ITKImageProcessing/Filters/ITKLabelContourImage.hpp" -#include "ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp" #include "ITKImageProcessing/Filters/ITKNotImage.hpp" #include "ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp" #include "ITKImageProcessing/Filters/ITKSigmoidImage.hpp" #include "ITKImageProcessing/Filters/ITKSquareImage.hpp" #include "ITKImageProcessing/Filters/ITKThresholdImage.hpp" -#include "ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp" -#include "ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp" #include "ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp" // @@__HEADER__TOKEN__DO__NOT__DELETE__@@ #endif @@ -81,34 +83,48 @@ namespace complex {complex::Uuid::FromString("cf7d7497-9573-5102-bedd-38f86a6cdfd4").value(), complex::FilterTraits::uuid}, // ITKImportImageStack {complex::Uuid::FromString("cc27ee9a-9946-56ad-afd4-6e98b71f417d").value(), complex::FilterTraits::uuid}, // ITKMedianImage {complex::Uuid::FromString("77bf2192-851d-5127-9add-634c1ef4f67f").value(), complex::FilterTraits::uuid}, // ITKRescaleIntensityImage + + #ifndef ITKIMAGEPROCESSING_LEAN_AND_MEAN + +#ifndef COMPLEX_CONDA_BUILD + {complex::Uuid::FromString("3c451ac9-bfef-5e41-bae9-3957a0fc26a1").value(), complex::FilterTraits::uuid}, // ITKBinaryContourImage + {complex::Uuid::FromString("bd1c2353-0a39-52c0-902b-ee64721994c7").value(), complex::FilterTraits::uuid}, // ITKBinaryOpeningByReconstructionImage + {complex::Uuid::FromString("99a7aa3c-f945-5e77-875a-23b5231ab3f4").value(), complex::FilterTraits::uuid}, // ITKClosingByReconstructionImage + {complex::Uuid::FromString("54c8dd45-88c4-5d4b-8a39-e3cc595e1cf8").value(), complex::FilterTraits::uuid}, // ITKGrayscaleFillholeImage + {complex::Uuid::FromString("d910551f-4eec-55c9-b0ce-69c2277e61bd").value(), complex::FilterTraits::uuid}, // ITKGrayscaleGrindPeakImage + {complex::Uuid::FromString("8bc34707-04c0-5e83-8583-48ee19306a1d").value(), complex::FilterTraits::uuid}, // ITKHConvexImage + {complex::Uuid::FromString("932a6df4-212e-53a1-a2ab-c29bd376bb7b").value(), complex::FilterTraits::uuid}, // ITKHMaximaImage + {complex::Uuid::FromString("f1d7cf59-9b7c-53cb-b71a-76cf91c86e8f").value(), complex::FilterTraits::uuid}, // ITKHMinimaImage + {complex::Uuid::FromString("668f0b90-b504-5fba-b648-7c9677e1f452").value(), complex::FilterTraits::uuid}, // ITKLabelContourImage + {complex::Uuid::FromString("12c83608-c4c5-5c72-b22f-a7696e3f5448").value(), complex::FilterTraits::uuid}, // ITKMorphologicalGradientImage + {complex::Uuid::FromString("b2248340-a371-5899-90a2-86047950f0a2").value(), complex::FilterTraits::uuid}, // ITKMorphologicalWatershedImage + {complex::Uuid::FromString("ca04004f-fb11-588d-9f77-d00b3ee9ad2a").value(), complex::FilterTraits::uuid}, // ITKOpeningByReconstructionImage + {complex::Uuid::FromString("bb15d42a-3077-582a-be1a-76b2bae172e9").value(), complex::FilterTraits::uuid}, // ITKSignedMaurerDistanceMapImage + {complex::Uuid::FromString("10aff542-81c5-5f09-9797-c7171c40b6a0").value(), complex::FilterTraits::uuid}, // ITKValuedRegionalMaximaImage + {complex::Uuid::FromString("739a0908-cb60-50f7-a484-b2157d023093").value(), complex::FilterTraits::uuid}, // ITKValuedRegionalMinimaImage +#endif + {complex::Uuid::FromString("09f45c29-1cfb-566c-b3ae-d832b4f95905").value(), complex::FilterTraits::uuid}, // ITKAbsImage {complex::Uuid::FromString("b09ec654-87a5-5dfa-9949-aa69f1fbfdd1").value(), complex::FilterTraits::uuid}, // ITKAcosImage {complex::Uuid::FromString("2d5a7599-5e01-5489-a107-23b704d2b5eb").value(), complex::FilterTraits::uuid}, // ITKAdaptiveHistogramEqualizationImage {complex::Uuid::FromString("79509ab1-24e1-50e4-9351-c5ce7cd87a72").value(), complex::FilterTraits::uuid}, // ITKAsinImage {complex::Uuid::FromString("e938569d-3644-5d00-a4e0-ab327937457d").value(), complex::FilterTraits::uuid}, // ITKAtanImage - {complex::Uuid::FromString("3c451ac9-bfef-5e41-bae9-3957a0fc26a1").value(), complex::FilterTraits::uuid}, // ITKBinaryContourImage {complex::Uuid::FromString("ba8a3f2e-3963-57c0-a8da-239e25de0526").value(), complex::FilterTraits::uuid}, // ITKBinaryThresholdImage - {complex::Uuid::FromString("99a7aa3c-f945-5e77-875a-23b5231ab3f4").value(), complex::FilterTraits::uuid}, // ITKClosingByReconstructionImage {complex::Uuid::FromString("2c2d7bf6-1e78-52e6-80aa-58b504ce0912").value(), complex::FilterTraits::uuid}, // ITKCosImage {complex::Uuid::FromString("3aa99151-e722-51a0-90ba-71e93347ab09").value(), complex::FilterTraits::uuid}, // ITKGradientMagnitudeImage - {complex::Uuid::FromString("54c8dd45-88c4-5d4b-8a39-e3cc595e1cf8").value(), complex::FilterTraits::uuid}, // ITKGrayscaleFillholeImage {complex::Uuid::FromString("c6e10fa5-5462-546b-b34b-0f0ea75a7e43").value(), complex::FilterTraits::uuid}, // ITKInvertIntensityImage {complex::Uuid::FromString("dbfd1a57-2a17-572d-93a7-8fd2f8e92eb0").value(), complex::FilterTraits::uuid}, // ITKLog10Image {complex::Uuid::FromString("69aba77c-9a35-5251-a18a-e3728ddd2963").value(), complex::FilterTraits::uuid}, // ITKLogImage {complex::Uuid::FromString("97102d65-9c32-576a-9177-c59d958bad10").value(), complex::FilterTraits::uuid}, // ITKMaskImage - {complex::Uuid::FromString("b2248340-a371-5899-90a2-86047950f0a2").value(), complex::FilterTraits::uuid}, // ITKMorphologicalWatershedImage {complex::Uuid::FromString("5b905619-c46b-5690-b6fa-8e97cf4537b8").value(), complex::FilterTraits::uuid}, // ITKNormalizeImage - {complex::Uuid::FromString("ca04004f-fb11-588d-9f77-d00b3ee9ad2a").value(), complex::FilterTraits::uuid}, // ITKOpeningByReconstructionImage {complex::Uuid::FromString("6e66563a-edcf-5e11-bc1d-ceed36d8493f").value(), complex::FilterTraits::uuid}, // ITKOtsuMultipleThresholdsImage - {complex::Uuid::FromString("bb15d42a-3077-582a-be1a-76b2bae172e9").value(), complex::FilterTraits::uuid}, // ITKSignedMaurerDistanceMapImage {complex::Uuid::FromString("1eb4b4f7-1704-58e4-9f78-8726a5c8c302").value(), complex::FilterTraits::uuid}, // ITKSinImage {complex::Uuid::FromString("8087dcad-68f2-598b-9670-d0f57647a445").value(), complex::FilterTraits::uuid}, // ITKSqrtImage {complex::Uuid::FromString("672810d9-5ec0-59c1-a209-8fb56c7a018a").value(), complex::FilterTraits::uuid}, // ITKTanImage {complex::Uuid::FromString("f86167ad-a1a1-557b-97ea-92a3618baa8f").value(), complex::FilterTraits::uuid}, // ITKBinaryDilateImage {complex::Uuid::FromString("522c5249-c048-579a-98dd-f7aadafc5578").value(), complex::FilterTraits::uuid}, // ITKBinaryErodeImage {complex::Uuid::FromString("704c801a-7549-54c4-9def-c4bb58d07fd1").value(), complex::FilterTraits::uuid}, // ITKBinaryMorphologicalOpeningImage - {complex::Uuid::FromString("bd1c2353-0a39-52c0-902b-ee64721994c7").value(), complex::FilterTraits::uuid}, // ITKBinaryOpeningByReconstructionImage {complex::Uuid::FromString("606c3700-f793-5852-9a0f-3123bd212447").value(), complex::FilterTraits::uuid}, // ITKBinaryProjectionImage {complex::Uuid::FromString("dcceeb50-5924-5eae-88ea-34793cf545a9").value(), complex::FilterTraits::uuid}, // ITKBinaryThinningImage {complex::Uuid::FromString("e26e7359-f72c-5924-b42e-dd5dd454a794").value(), complex::FilterTraits::uuid}, // ITKBlackTopHatImage @@ -118,22 +134,14 @@ namespace complex {complex::Uuid::FromString("634c2306-c1ee-5a45-a55c-f8286e36999a").value(), complex::FilterTraits::uuid}, // ITKExpNegativeImage {complex::Uuid::FromString("66cec151-2950-51f8-8a02-47d3516d8721").value(), complex::FilterTraits::uuid}, // ITKGrayscaleDilateImage {complex::Uuid::FromString("aef4e804-3f7a-5dc0-911c-b1f16a393a69").value(), complex::FilterTraits::uuid}, // ITKGrayscaleErodeImage - {complex::Uuid::FromString("d910551f-4eec-55c9-b0ce-69c2277e61bd").value(), complex::FilterTraits::uuid}, // ITKGrayscaleGrindPeakImage {complex::Uuid::FromString("849a1903-5595-5029-bbde-6f4b68b2a25c").value(), complex::FilterTraits::uuid}, // ITKGrayscaleMorphologicalClosingImage {complex::Uuid::FromString("c88ac42b-9477-5088-9ec0-862af1e0bb56").value(), complex::FilterTraits::uuid}, // ITKGrayscaleMorphologicalOpeningImage - {complex::Uuid::FromString("8bc34707-04c0-5e83-8583-48ee19306a1d").value(), complex::FilterTraits::uuid}, // ITKHConvexImage - {complex::Uuid::FromString("932a6df4-212e-53a1-a2ab-c29bd376bb7b").value(), complex::FilterTraits::uuid}, // ITKHMaximaImage - {complex::Uuid::FromString("f1d7cf59-9b7c-53cb-b71a-76cf91c86e8f").value(), complex::FilterTraits::uuid}, // ITKHMinimaImage {complex::Uuid::FromString("4faf4c59-6f29-53af-bc78-5aecffce0e37").value(), complex::FilterTraits::uuid}, // ITKIntensityWindowingImage - {complex::Uuid::FromString("668f0b90-b504-5fba-b648-7c9677e1f452").value(), complex::FilterTraits::uuid}, // ITKLabelContourImage - {complex::Uuid::FromString("12c83608-c4c5-5c72-b22f-a7696e3f5448").value(), complex::FilterTraits::uuid}, // ITKMorphologicalGradientImage {complex::Uuid::FromString("c8362fb9-d3ab-55c0-902b-274cc27d9bb8").value(), complex::FilterTraits::uuid}, // ITKNotImage {complex::Uuid::FromString("4398d76d-c9aa-5161-bb48-92dd9daaa352").value(), complex::FilterTraits::uuid}, // ITKRelabelComponentImage {complex::Uuid::FromString("e6675be7-e98d-5e0f-a088-ba15cc301038").value(), complex::FilterTraits::uuid}, // ITKSigmoidImage {complex::Uuid::FromString("f092420e-14a0-5dc0-91f8-de0082103aef").value(), complex::FilterTraits::uuid}, // ITKSquareImage {complex::Uuid::FromString("5845ee06-5c8a-5a74-80fb-c820bd8dfb75").value(), complex::FilterTraits::uuid}, // ITKThresholdImage - {complex::Uuid::FromString("10aff542-81c5-5f09-9797-c7171c40b6a0").value(), complex::FilterTraits::uuid}, // ITKValuedRegionalMaximaImage - {complex::Uuid::FromString("739a0908-cb60-50f7-a484-b2157d023093").value(), complex::FilterTraits::uuid}, // ITKValuedRegionalMinimaImage {complex::Uuid::FromString("02e059f7-8055-52b4-9d48-915b67d1e39a").value(), complex::FilterTraits::uuid}, // ITKWhiteTopHatImage // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ #endif diff --git a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt index 7f246fbc15..c85800a92e 100644 --- a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt @@ -9,6 +9,25 @@ set(${PLUGIN_NAME}UnitTest_SRCS ITKMhaFileReaderTest.cpp ITKRescaleIntensityImageTest.cpp ) +if(NOT COMPLEX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) + list(APPEND ${PLUGIN_NAME}UnitTest_SRCS + ITKBinaryContourImageTest.cpp + ITKBinaryOpeningByReconstructionImageTest.cpp + ITKClosingByReconstructionImageTest.cpp + ITKGrayscaleFillholeImageTest.cpp + ITKGrayscaleGrindPeakImageTest.cpp + ITKHConvexImageTest.cpp + ITKHMaximaImageTest.cpp + ITKHMinimaImageTest.cpp + ITKLabelContourImageTest.cpp + ITKMorphologicalGradientImageTest.cpp + ITKMorphologicalWatershedImageTest.cpp + ITKOpeningByReconstructionImageTest.cpp + ITKSignedMaurerDistanceMapImageTest.cpp + ITKValuedRegionalMaximaImageTest.cpp + ITKValuedRegionalMinimaImageTest.cpp + ) + endif() if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) list(APPEND ${PLUGIN_NAME}UnitTest_SRCS @@ -17,17 +36,14 @@ if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ITKAdaptiveHistogramEqualizationImageTest.cpp ITKAsinImageTest.cpp ITKAtanImageTest.cpp - ITKBinaryContourImageTest.cpp ITKBinaryDilateImageTest.cpp ITKBinaryErodeImageTest.cpp ITKBinaryMorphologicalClosingImageTest.cpp ITKBinaryMorphologicalOpeningImageTest.cpp - ITKBinaryOpeningByReconstructionImageTest.cpp ITKBinaryProjectionImageTest.cpp ITKBinaryThinningImageTest.cpp ITKBinaryThresholdImageTest.cpp ITKBlackTopHatImageTest.cpp - ITKClosingByReconstructionImageTest.cpp ITKCosImageTest.cpp ITKDilateObjectMorphologyImageTest.cpp ITKErodeObjectMorphologyImageTest.cpp @@ -36,36 +52,24 @@ if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ITKGradientMagnitudeImageTest.cpp ITKGrayscaleDilateImageTest.cpp ITKGrayscaleErodeImageTest.cpp - ITKGrayscaleFillholeImageTest.cpp - ITKGrayscaleGrindPeakImageTest.cpp ITKGrayscaleMorphologicalClosingImageTest.cpp ITKGrayscaleMorphologicalOpeningImageTest.cpp - ITKHConvexImageTest.cpp - ITKHMaximaImageTest.cpp - ITKHMinimaImageTest.cpp ITKImportFijiMontageTest.cpp ITKIntensityWindowingImageTest.cpp ITKInvertIntensityImageTest.cpp - ITKLabelContourImageTest.cpp ITKLog10ImageTest.cpp ITKLogImageTest.cpp ITKMaskImageTest.cpp - ITKMorphologicalGradientImageTest.cpp - ITKMorphologicalWatershedImageTest.cpp ITKNormalizeImageTest.cpp ITKNotImageTest.cpp - ITKOpeningByReconstructionImageTest.cpp ITKOtsuMultipleThresholdsImageTest.cpp ITKRelabelComponentImageTest.cpp ITKSigmoidImageTest.cpp - ITKSignedMaurerDistanceMapImageTest.cpp ITKSinImageTest.cpp ITKSqrtImageTest.cpp ITKSquareImageTest.cpp ITKTanImageTest.cpp ITKThresholdImageTest.cpp - ITKValuedRegionalMaximaImageTest.cpp - ITKValuedRegionalMinimaImageTest.cpp ITKWhiteTopHatImageTest.cpp ) endif()