...

[FrontAlgorithms.git] / plugins / fpa / ImageRegionGrow.cxx

diff --git a/plugins/fpa/ImageRegionGrow.cxx b/plugins/fpa/ImageRegionGrow.cxx
index 27d5eca405c52c232d6102d760ec0defc12ee754..8ee71cabc001bdc21a1d4a3d12285985f64d8b40 100644 (file)
--- a/plugins/fpa/ImageRegionGrow.cxx
+++ b/plugins/fpa/ImageRegionGrow.cxx
@@ -2,14 +2,6 @@
 
 #include <cpPlugins/Image.h>
 #include <fpa_Instances/Filters.h>
-#include <fpa/Image/Functors/RegionGrowAllBelongsFunction.h>
-
-#include <fpa/Base/Algorithm.hxx>
-#include <fpa/Base/RegionGrow.hxx>
-#include <fpa/Image/Algorithm.hxx>
-#include <fpa/Image/RegionGrow.hxx>
-#include <fpa/VTK/Image2DObserver.hxx>
-#include <fpa/VTK/Image3DObserver.hxx>
 
 // -------------------------------------------------------------------------
 fpaPlugins::ImageRegionGrow::
@@ -44,25 +36,24 @@ template< class _TImage >
 std::string fpaPlugins::ImageRegionGrow::
 _GD0( _TImage* image )
 {
-  typedef fpa::Image::RegionGrow< _TImage, _TImage > _TFilter;
-  typedef typename _TFilter::TGrowingFunction        _TGrowFunctor;
-  typedef typename _TFilter::TResult                 _TResult;
+  typedef unsigned short _TPixel;
+  typedef itk::Image< _TPixel, _TImage::ImageDimension > _TOutImage;
+  typedef fpa::Image::RegionGrow< _TImage, _TOutImage >  _TFilter;
+  typedef typename _TFilter::TGrowingFunction            _TGrowFunctor;
+  typedef typename _TFilter::TResult                     _TResult;
 
   if( image == NULL )
     return( "fpaPlugins::ImageRegionGrow: Invalid image type." );
 
-  // Get functor (if any)
+  // Create filter
+  _TFilter* filter = this->_ConfigureFilter< _TFilter >( );
+
   typename _TGrowFunctor::Pointer functor;
   auto wrap_functor = this->GetInputData( "GrowFunctor" );
   if( wrap_functor != NULL )
     functor = wrap_functor->GetITK< _TGrowFunctor >( );
   if( functor.IsNull( ) )
-    functor =
-      fpa::Image::Functors::RegionGrowAllBelongsFunction< _TImage >::New( );
-
-  // Create filter
-  _TFilter* filter = this->_ConfigureFilter< _TFilter >( );
-  filter->SetGrowingFunction( functor );
+    filter->SetGrowingFunction( functor );
   filter->SetInsideValue(
     _TResult( this->m_Parameters.GetUint( "InsideValue" ) )
     );