Cast image filter added. ROI filter modified.

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

diff --git a/plugins/ImageGradientFilters/MFluxImageFilter.cxx b/plugins/ImageGradientFilters/MFluxImageFilter.cxx
index b02701a4c4d9726ef43ea4cea2e24d7768e773c8..791e90d98eff1c150d17c5a5f8bf8bfd651435cd 100644 (file)
--- a/plugins/ImageGradientFilters/MFluxImageFilter.cxx
+++ b/plugins/ImageGradientFilters/MFluxImageFilter.cxx
@@ -1,31 +1,23 @@
-#include <plugins/ImageGradientFilters/MFluxImageFilter.h>
-#include <cpPlugins/DataObjects/Image.h>
+#include <ImageGradientFilters/MFluxImageFilter.h>
+#include <cpInstances/Image.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>
+#include <cpExtensions/Algorithms/MFluxMedialness.h>
 
 // -------------------------------------------------------------------------
 cpPluginsImageGradientFilters::MFluxImageFilter::
 MFluxImageFilter( )
   : 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 cpInstances::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 +31,8 @@ void cpPluginsImageGradientFilters::MFluxImageFilter::
 _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." );
 }
 
 // -------------------------------------------------------------------------
@@ -49,7 +41,7 @@ void cpPluginsImageGradientFilters::MFluxImageFilter::
 _GD0( _TImage* image )
 {
   typedef typename _TImage::PixelType _TGradient;
-  typedef cpExtensions::Algorithms::FluxMedialness< _TImage > _TFunction;
+  typedef cpExtensions::Algorithms::MFluxMedialness< _TImage > _TFunction;
   typedef typename _TFunction::TOutput _TScalar;
   typedef itk::Image< _TScalar, _TImage::ImageDimension > _TOutputImage;
   typedef cpExtensions::Algorithms::ImageFunctionFilter< _TImage, _TOutputImage, _TFunction > _TFilter;