X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FAlgorithms%2FImageFunctionFilter.h;h=503f791355862e362a7e3d59fb371f708954b1a4;hb=8eaa2cf759c39233848cdd5b8346faccbea4c172;hp=c025bcb30837580abecb12ddb8e7f18273ffa272;hpb=2361f4f97631e09d88d8a5510a369817dcaa19db;p=cpPlugins.git

diff --git a/lib/cpExtensions/Algorithms/ImageFunctionFilter.h b/lib/cpExtensions/Algorithms/ImageFunctionFilter.h
index c025bcb..503f791 100644
--- a/lib/cpExtensions/Algorithms/ImageFunctionFilter.h
+++ b/lib/cpExtensions/Algorithms/ImageFunctionFilter.h
@@ -5,99 +5,64 @@
 #ifndef __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
 #define __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
 
+#include <cpExtensions/Config.h>
 #include <itkImageToImageFilter.h>
-#include <itkImageScanlineConstIterator.h>
-#include <itkImageScanlineIterator.h>
-#include <itkProgressReporter.h>
 
 namespace cpExtensions
+{
+  namespace Algorithms
   {
-    namespace Algorithms
+    /**
+     */
+    template< class _TInput, class _TOutput, class _TFunction >
+    class ImageFunctionFilter
+      : public itk::ImageToImageFilter< _TInput, _TOutput >
     {
-      /**
-       */
-      template< class I, class O, class F >
-      class ImageFunctionFilter
-        : public itk::ImageToImageFilter< I, O >
-      {
-      public:
-        typedef ImageFunctionFilter             Self;
-        typedef itk::ImageToImageFilter< I, O > Superclass;
-        typedef itk::SmartPointer< Self >       Pointer;
-        typedef itk::SmartPointer< const Self > ConstPointer;
-
-        typedef I TInputImage;
-        typedef O TOutputImage;
-        typedef F TFunction;
-
-        typedef typename O::RegionType TRegion;
-
-      public:
-        itkNewMacro( Self );
-        itkTypeMacro( ImageFunctionFilter, itkImageToImageFilter );
-
-        itkGetObjectMacro( Function, F );
-        itkSetObjectMacro( Function, F );
-
-      protected:
-        ImageFunctionFilter( )
-          : Superclass( )
-          {
-          }
-        virtual ~ImageFunctionFilter( )
-          {
-          }
-
-        virtual void ThreadedGenerateData(
-          const TRegion& region,
-          itk::ThreadIdType threadId
-          )
-          {
-            const typename TRegion::SizeType& regionSize = region.GetSize( );
-            if( regionSize[ 0 ] == 0 )
-              return;
-            const I* in = this->GetInput( );
-            O* out = this->GetOutput( 0 );
-
-            const size_t nLines = region.GetNumberOfPixels( ) / regionSize[ 0 ];
-            itk::ProgressReporter progress( this, threadId, nLines );
-
-            // Define the iterators
-            itk::ImageScanlineConstIterator< I > inIt( in, region );
-            itk::ImageScanlineIterator< O > outIt( out, region );
-
-            inIt.GoToBegin( );
-            outIt.GoToBegin( );
-            while( !inIt.IsAtEnd( ) )
-            {
-              while( !inIt.IsAtEndOfLine( ) )
-              {
-                outIt.Set( this->m_Function->EvaluateAtIndex( inIt.GetIndex( ) ) );
-                ++inIt;
-                ++outIt;
-
-              } // elihw
-              inIt.NextLine( );
-              outIt.NextLine( );
-              progress.CompletedPixel( );
-
-            } // elihw
-          }
-
-      private:
-        // Purposely not implemented.
-        ImageFunctionFilter( const Self& );
-        void operator=( const Self& );
-
-      protected:
-        typename F::Pointer m_Function;
-      };
-
-    } // ecapseman
+    public:
+      typedef ImageFunctionFilter                          Self;
+      typedef itk::ImageToImageFilter< _TInput, _TOutput > Superclass;
+      typedef itk::SmartPointer< Self >                    Pointer;
+      typedef itk::SmartPointer< const Self >              ConstPointer;
+
+      typedef _TInput    TInput;
+      typedef _TOutput   TOutput;
+      typedef _TFunction TFunction;
+
+      typedef typename TOutput::RegionType TRegion;
+
+    public:
+      itkNewMacro( Self );
+      itkTypeMacro( ImageFunctionFilter, itkImageToImageFilter );
+
+      itkGetObjectMacro( Function, TFunction );
+      itkSetObjectMacro( Function, TFunction );
+
+    protected:
+      ImageFunctionFilter( );
+      virtual ~ImageFunctionFilter( );
+
+      virtual void BeforeThreadedGenerateData( ) cpExtensions_OVERRIDE;
+      virtual void ThreadedGenerateData(
+        const TRegion& region,
+        itk::ThreadIdType threadId
+        ) cpExtensions_OVERRIDE;
+
+    private:
+      // Purposely not implemented.
+      ImageFunctionFilter( const Self& );
+      void operator=( const Self& );
+
+    protected:
+      typename TFunction::Pointer m_Function;
+    };
+
+  } // ecapseman
 
 } // ecapseman
 
-// TODO: #include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
 #endif // __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__