...

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

diff --git a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
index 52525d9c1633d3698c54e8bd2328c7e2678782d7..089b6d5ad80e0e2b1bc02ac774a4fa4f5d0efc45 100644 (file)
--- a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
+++ b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx
@@ -1,35 +1,25 @@
 #include <ImageGradientFilters/GulsunTekImageFilter.h>
 #include <cpPlugins/DataObjects/Image.h>
-#include <cpPlugins/DataObjects/Image_Demangler.h>
- 
-/* TODO
-   #include <cpExtensions/Algorithms/ImageFunctionFilter.h>
-   #include <cpExtensions/Algorithms/GulsunTekMedialness.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
 
-   #include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
-   #include <cpExtensions/Algorithms/GulsunTekMedialness.hxx>
-   #include <cpExtensions/Algorithms/GradientImageFunctionBase.hxx>
-   #include <itkImageFunction.hxx>
-*/
+#include <cpExtensions/Algorithms/ImageFunctionFilter.h>
+#include <cpExtensions/Algorithms/GulsunTekMedialness.h>
 
 // -------------------------------------------------------------------------
 cpPluginsImageGradientFilters::GulsunTekImageFilter::
 GulsunTekImageFilter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input", true, false );
-  this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Mask", false, 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 );
 }
 
 // -------------------------------------------------------------------------
@@ -43,8 +33,8 @@ 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." );
 }
 
 // -------------------------------------------------------------------------
@@ -52,45 +42,17 @@ template< class _TImage >
 void cpPluginsImageGradientFilters::GulsunTekImageFilter::
 _GD0( _TImage* image )
 {
-  typedef itk::Image< char, _TImage::ImageDimension > _TChar;
-  typedef itk::Image< short, _TImage::ImageDimension > _TShort;
-  typedef itk::Image< int, _TImage::ImageDimension > _TInt;
-  typedef itk::Image< long, _TImage::ImageDimension > _TLong;
-  typedef itk::Image< float, _TImage::ImageDimension > _TFloat;
-  typedef itk::Image< double, _TImage::ImageDimension > _TDouble;
-  typedef itk::Image< unsigned char, _TImage::ImageDimension > _TUChar;
-  typedef itk::Image< unsigned short, _TImage::ImageDimension > _TUShort;
-  typedef itk::Image< unsigned int, _TImage::ImageDimension > _TUInt;
-  typedef itk::Image< unsigned long, _TImage::ImageDimension > _TULong;
+  typedef itk::Image< bool, _TImage::ImageDimension > _TDummy;
 
-  auto m = this->GetInput( "Mask" );
-  auto ci = m->GetITK< _TChar >( );
-  auto si = m->GetITK< _TShort >( );
-  auto ii = m->GetITK< _TInt >( );
-  auto li = m->GetITK< _TLong >( );
-  auto fi = m->GetITK< _TFloat >( );
-  auto di = m->GetITK< _TDouble >( );
-  auto uci = m->GetITK< _TUChar >( );
-  auto usi = m->GetITK< _TUShort >( );
-  auto uii = m->GetITK< _TUInt >( );
-  auto uli = m->GetITK< _TULong >( );
-  if     (  ci != NULL ) this->_GD1( image,  ci );
-  else if(  si != NULL ) this->_GD1( image,  si );
-  else if(  ii != NULL ) this->_GD1( image,  ii );
-  else if(  li != NULL ) this->_GD1( image,  li );
-  else if(  fi != NULL ) this->_GD1( image,  fi );
-  else if(  di != NULL ) this->_GD1( image,  di );
-  else if( uci != NULL ) this->_GD1( image, uci );
-  else if( usi != NULL ) this->_GD1( image, usi );
-  else if( uii != NULL ) this->_GD1( image, uii );
-  else if( uli != NULL ) this->_GD1( image, uli );
-  else                   this->_GD1( image, ci );
+  auto o = this->GetInputData( "Mask" );
+  cpPlugins_Demangle_Image_ScalarPixels_2( o, _GD1, _TImage::ImageDimension, image )
+    this->_GD1< _TDummy, _TImage >( NULL, image );
 }
 
 // -------------------------------------------------------------------------
-template< class _TImage, class _TMask >
+template< class _TMask, class _TImage >
 void cpPluginsImageGradientFilters::GulsunTekImageFilter::
-_GD1( _TImage* image, _TMask* mask )
+_GD1( _TMask* mask, _TImage* image )
 {
   typedef typename _TImage::PixelType _TGradient;
   typedef cpExtensions::Algorithms::GulsunTekMedialness< _TImage, _TMask > _TFunction;