...

[cpPlugins.git] / plugins / ImageGradientFilters / GulsunTekImageFilter.cxx

diff --git a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
index 76a9bffca3f754d462d13b61c4fa691915a6e0a4..ccbca7c5fc94b5b2af7d7cda4fa6c13ec45a5cca 100644 (file)
--- a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
+++ b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
@@ -1,31 +1,25 @@
-#include <plugins/ImageGradientFilters/GulsunTekImageFilter.h>
+#include <ImageGradientFilters/GulsunTekImageFilter.h>
 #include <cpPlugins/DataObjects/Image.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
 
 #include <cpExtensions/Algorithms/ImageFunctionFilter.h>
 #include <cpExtensions/Algorithms/GulsunTekMedialness.h>
 
-#include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
-#include <cpExtensions/Algorithms/GulsunTekMedialness.hxx>
-#include <cpExtensions/Algorithms/GradientImageFunctionBase.hxx>
-#include <itkImageFunction.hxx>
-
 // -------------------------------------------------------------------------
 cpPluginsImageGradientFilters::GulsunTekImageFilter::
 GulsunTekImageFilter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input", true, false );
-  this->_ConfigureOutput< cpPlugins::DataObjects::Image >( "Output" );
+  typedef cpPlugins::DataObjects::Image _TImage;
 
-  this->m_Parameters.ConfigureAsReal( "MinRadius" );
-  this->m_Parameters.ConfigureAsReal( "MaxRadius" );
-  this->m_Parameters.ConfigureAsUint( "ProfileSampling" );
-  this->m_Parameters.ConfigureAsUint( "RadialSampling" );
+  this->_ConfigureInput< _TImage >( "Input", true, false );
+  this->_ConfigureInput< _TImage >( "Mask", false, false );
+  this->_ConfigureOutput< _TImage >( "Output" );
 
-  this->m_Parameters.SetReal( "MinRadius", 0 );
-  this->m_Parameters.SetReal( "MaxRadius", 1 );
-  this->m_Parameters.SetUint( "ProfileSampling", 4 );
-  this->m_Parameters.SetUint( "RadialSampling", 10 );
+  this->m_Parameters.ConfigureAsReal( "MinRadius", 0 );
+  this->m_Parameters.ConfigureAsReal( "MaxRadius", 1 );
+  this->m_Parameters.ConfigureAsUint( "ProfileSampling", 4 );
+  this->m_Parameters.ConfigureAsUint( "RadialSampling", 10 );
 }
 
 // -------------------------------------------------------------------------
@@ -39,17 +33,29 @@ void cpPluginsImageGradientFilters::GulsunTekImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
-  cpPlugins_Demangle_ImageCovariantVectors_Dims( o, _GD0 );
-  else this->_Error( "Invalid input image." );
+  cpPlugins_Demangle_Image_CovariantVectorPixels_AllDims_1( o, _GD0 )
+    this->_Error( "Invalid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage >
 void cpPluginsImageGradientFilters::GulsunTekImageFilter::
 _GD0( _TImage* image )
+{
+  typedef itk::Image< unsigned char, _TImage::ImageDimension > _TDummy;
+
+  auto o = this->GetInputData( "Mask" );
+  cpPlugins_Demangle_Image_ScalarPixels_2( o, _GD1, _TImage::ImageDimension, image )
+    this->_GD1< _TDummy, _TImage >( NULL, image );
+}
+
+// -------------------------------------------------------------------------
+template< class _TMask, class _TImage >
+void cpPluginsImageGradientFilters::GulsunTekImageFilter::
+_GD1( _TMask* mask, _TImage* image )
 {
   typedef typename _TImage::PixelType _TGradient;
-  typedef cpExtensions::Algorithms::GulsunTekMedialness< _TImage > _TFunction;
+  typedef cpExtensions::Algorithms::GulsunTekMedialness< _TImage, _TMask > _TFunction;
   typedef typename _TFunction::TOutput _TScalar;
   typedef itk::Image< _TScalar, _TImage::ImageDimension > _TOutputImage;
   typedef cpExtensions::Algorithms::ImageFunctionFilter< _TImage, _TOutputImage, _TFunction > _TFilter;
@@ -67,6 +73,8 @@ _GD0( _TImage* image )
   function->SetProfileSampling( this->m_Parameters.GetUint( "ProfileSampling" ) );
   function->SetRadialSampling( this->m_Parameters.GetUint( "RadialSampling" ) );
   filter->SetInput( image );
+  if( mask != NULL )
+    function->SetMask( mask );
   filter->Update( );
   this->GetOutput( "Output" )->SetITK( filter->GetOutput( ) );
 }