From 9f494b26ae4e5de45b4c2119a10de67ac0beeedf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leonardo=20Fl=C3=B3rez-Valencia?= Date: Mon, 28 Nov 2016 17:20:53 -0500 Subject: [PATCH] ... --- cmake/Options.cmake | 2 +- lib/cpInstances/ITKNeighborhoodImageIterators.i | 5 +++-- plugins/CMakeLists.txt | 12 +++++++++++- .../ITKDistanceMapFilters/ITKDistanceMapFilters.i | 5 +++-- .../SignedMaurerDistanceMapImageFilter.cxx | 8 -------- plugins/ITKMorphology/ITKMorphology.i | 6 ++++++ plugins/ITKSeparableFilters/ITKSeparableFilters.i | 7 +++++++ .../SmoothingRecursiveGaussianImageFilter.cxx | 4 ---- .../ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i | 3 +++ 9 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 plugins/ITKMorphology/ITKMorphology.i create mode 100644 plugins/ITKSeparableFilters/ITKSeparableFilters.i diff --git a/cmake/Options.cmake b/cmake/Options.cmake index dc09633..8dacb5d 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -3,7 +3,7 @@ ## =============================== SET(cpPlugins_CONFIG_NUMBER_OF_FILES "10" CACHE STRING "Number of compiled files.") -SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "2;3" CACHE STRING "Accepted processing dimensions.") +SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "1;2;3" CACHE STRING "Accepted processing dimensions.") SET(cpPlugins_CONFIG_VISUAL_DIMENSIONS "2;3" CACHE STRING "Accepted visual dimensions.") SET( diff --git a/lib/cpInstances/ITKNeighborhoodImageIterators.i b/lib/cpInstances/ITKNeighborhoodImageIterators.i index 74312fc..dd592ce 100644 --- a/lib/cpInstances/ITKNeighborhoodImageIterators.i +++ b/lib/cpInstances/ITKNeighborhoodImageIterators.i @@ -20,13 +20,14 @@ tinclude itk#co#:h|hxx tinclude itk#op#:h|hxx tinclude itk#it#:h|hxx +instances itk::NeighborhoodAllocator< #scalar_types#* > instances itk::NeighborhoodAllocator< #pi# > +instances itk::Neighborhood< #scalar_types#*, #pdims#, itk::NeighborhoodAllocator< #scalar_types#* > > + instances itk::#op#< #pi#, #pdims#, itk::NeighborhoodAllocator< #pi# > > instances itk::#co#< itk::Image< #pi#, #pdims# >, itk::Image< #pi#, #pdims# > > instances itk::#it#< itk::Image< #pi#, #pdims# >, itk::#co#< itk::Image< #pi#, #pdims# >, itk::Image< #pi#, #pdims# > > > -instances itk::Neighborhood< #scalar_types#*, #pdims#, itk::NeighborhoodAllocator< #scalar_types#* > > - tinclude itkNeighborhoodAlgorithm:h|hxx instances itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< itk::Image< #pi#, #pdims# > > diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 9c5005e..c398949 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -17,9 +17,10 @@ SET( ITKFiniteDifference ITKLevelSetFilters ITKDistanceMapFilters + ITKSeparableFilters + ITKMorphology ITKParaMorphology #ITKSliceFilters - #ITKSeparableFilters #ITKGenericFilters #ImageParaMorphologyFilters #ImageThresholdFilters @@ -62,6 +63,15 @@ TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES( cpPluginsITKDistanceMapFilters cpPluginsITKUnaryFunctorFilters + cpPluginsITKBinaryFunctorFilters + ) +TARGET_LINK_LIBRARIES( + cpPluginsITKSeparableFilters + cpPluginsITKImageGenericFilters_1 + ) +TARGET_LINK_LIBRARIES( + cpPluginsITKMorphology + cpPluginsITKUnaryFunctorFilters ) ## eof - $RCSfile$ diff --git a/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i b/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i index 1bb91eb..6a703ad 100644 --- a/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i +++ b/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i @@ -5,10 +5,11 @@ tinclude itkImageRegionIterator:h|h tinclude itkProgressReporter:h|h tinclude itkBinaryContourImageFilter:h|hxx -instances itk::BinaryContourImageFilter< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# > > +instances itk::BinaryContourImageFilter< itk::Image< #scalar_types#, #vdims# >, itk::Image< #scalar_types#, #vdims# > > define filters=SignedMaurerDistanceMapImageFilter +** ;DanielssonDistanceMapImageFilter;SignedDanielssonDistanceMapImageFilter tinclude itk#filters#:h|hxx -instances itk::#filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #real_types#, #pdims# > > +instances itk::#filters#< itk::Image< #scalar_types#, #vdims# >, itk::Image< #real_types#, #vdims# > > ** eof - $RCSfile$ diff --git a/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx index a8f5767..e62f1df 100644 --- a/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx +++ b/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx @@ -19,12 +19,8 @@ SignedMaurerDistanceMapImageFilter( ) this->m_Parameters.ConfigureAsBool( "UseImageSpacing", true ); std::vector< std::string > choices; -#ifdef cpPlugins_CONFIG_REAL_TYPES_float choices.push_back( "float" ); -#endif // cpPlugins_CONFIG_REAL_TYPES_float -#ifdef cpPlugins_CONFIG_REAL_TYPES_double choices.push_back( "double" ); -#endif // cpPlugins_CONFIG_REAL_TYPES_double this->m_Parameters.ConfigureAsChoices( "OutputResolution", choices ); } @@ -50,12 +46,8 @@ _GD0( _TImage* image ) { std::string out_res = this->m_Parameters.GetSelectedChoice( "OutputResolution" ); -#ifdef cpPlugins_CONFIG_REAL_TYPES_float if( out_res == "float" ) this->_GD1< _TImage, float >( image ); -#endif // cpPlugins_CONFIG_REAL_TYPES_float -#ifdef cpPlugins_CONFIG_REAL_TYPES_double if( out_res == "double" ) this->_GD1< _TImage, double >( image ); -#endif // cpPlugins_CONFIG_REAL_TYPES_double } // ------------------------------------------------------------------------- diff --git a/plugins/ITKMorphology/ITKMorphology.i b/plugins/ITKMorphology/ITKMorphology.i new file mode 100644 index 0000000..0ac9aab --- /dev/null +++ b/plugins/ITKMorphology/ITKMorphology.i @@ -0,0 +1,6 @@ +header #define ITK_MANUAL_INSTANTIATION + +tinclude itkBinaryFillholeImageFilter:h|hxx +instances itk::BinaryFillholeImageFilter< itk::Image< #scalar_types#, #pdims# > > + +** eof - $RCSfile$ diff --git a/plugins/ITKSeparableFilters/ITKSeparableFilters.i b/plugins/ITKSeparableFilters/ITKSeparableFilters.i new file mode 100644 index 0000000..ad1c5f5 --- /dev/null +++ b/plugins/ITKSeparableFilters/ITKSeparableFilters.i @@ -0,0 +1,7 @@ +header #define ITK_MANUAL_INSTANTIATION + +define filters=RecursiveSeparableImageFilter;RecursiveGaussianImageFilter;SmoothingRecursiveGaussianImageFilter +tinclude itk#filters#:h|hxx +instances itk::#filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #real_types#, #pdims# > > + +** eof - $RCSfile$ diff --git a/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx b/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx index 9cf2381..44a072c 100644 --- a/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx +++ b/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx @@ -36,12 +36,8 @@ _GD0( _TImage* image ) { std::string out_res = this->m_Parameters.GetSelectedChoice( "OutputResolution" ); -#ifdef cpPlugins_CONFIG_REAL_TYPES_float if( out_res == "float" ) this->_GD1< _TImage, float >( image ); -#endif // cpPlugins_CONFIG_REAL_TYPES_float -#ifdef cpPlugins_CONFIG_REAL_TYPES_double if( out_res == "double" ) this->_GD1< _TImage, double >( image ); -#endif // cpPlugins_CONFIG_REAL_TYPES_double } // ------------------------------------------------------------------------- diff --git a/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i b/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i index ee62555..4bf7475 100644 --- a/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i +++ b/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i @@ -14,6 +14,9 @@ instances itk::UnaryFunctorImageFilter< itk::Image< #scalar_types#, #pdims# >, i instances itk::UnaryFunctorImageFilter< itk::Image< #all_ints#, #pdims# >, itk::Image< #all_ints#, #pdims# >, itk::Functor::#b_functor#< #all_ints#, #all_ints# > > +cinclude itkBinaryNotImageFilter.h +instances itk::UnaryFunctorImageFilter< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# >, itk::Functor::BinaryNot< #scalar_types# > > + define oa_filters=InvertIntensityImageFilter tinclude itk#oa_filters#:h|hxx instances itk::#oa_filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# > > -- 2.45.0