...

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

diff --git a/plugins/ImageGradientFilters/FluxImageFilter.cxx b/plugins/ImageGradientFilters/FluxImageFilter.cxx
index 9e91a15a72b4c74fd5ec819c3dd83e454d29e0cf..8aa7dd6a9951b52d4fa937024a1cf6fa1df2c5c9 100644 (file)
--- a/plugins/ImageGradientFilters/FluxImageFilter.cxx
+++ b/plugins/ImageGradientFilters/FluxImageFilter.cxx
@@ -1,31 +1,24 @@
-#include <plugins/ImageGradientFilters/FluxImageFilter.h>
+#include <ImageGradientFilters/FluxImageFilter.h>
 #include <cpPlugins/DataObjects/Image.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
 
 #include <cpExtensions/Algorithms/ImageFunctionFilter.h>
 #include <cpExtensions/Algorithms/FluxMedialness.h>
 
-#include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
-#include <cpExtensions/Algorithms/FluxMedialness.hxx>
-#include <cpExtensions/Algorithms/GradientImageFunctionBase.hxx>
-#include <itkImageFunction.hxx>
-
 // -------------------------------------------------------------------------
 cpPluginsImageGradientFilters::FluxImageFilter::
 FluxImageFilter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input", true, false );
-  this->_ConfigureOutput< cpPlugins::DataObjects::Image >( "Output" );
-
-  this->m_Parameters.ConfigureAsReal( "MinRadius" );
-  this->m_Parameters.ConfigureAsReal( "MaxRadius" );
-  this->m_Parameters.ConfigureAsReal( "RadiusStep" );
-  this->m_Parameters.ConfigureAsUint( "RadialSampling" );
+  typedef cpPlugins::DataObjects::Image _TImage;
+  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.SetReal( "RadiusStep", 1 );
-  this->m_Parameters.SetUint( "RadialSampling", 4 );
+  this->m_Parameters.ConfigureAsReal( "MinRadius", 0 );
+  this->m_Parameters.ConfigureAsReal( "MaxRadius", 1 );
+  this->m_Parameters.ConfigureAsReal( "RadiusStep", 1 );
+  this->m_Parameters.ConfigureAsUint( "RadialSampling", 4 );
 }
 
 // -------------------------------------------------------------------------
@@ -39,8 +32,8 @@ void cpPluginsImageGradientFilters::FluxImageFilter::
 _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." );
 }
 
 // -------------------------------------------------------------------------