...

[FrontAlgorithms.git] / lib / fpa / Filters / Image / Mori.h

diff --git a/lib/fpa/Filters/Image/Mori.h b/lib/fpa/Filters/Image/Mori.h
index 5103a302a013fb575d4598bf8076dee43a7cd90d..3c1cf2a3eb07840dc0f3a47a9122520356580b43 100644 (file)
--- a/lib/fpa/Filters/Image/Mori.h
+++ b/lib/fpa/Filters/Image/Mori.h
@@ -6,10 +6,8 @@
 #define __fpa__Filters__Image__Mori__h__
 
 #include <fpa/Filters/Mori.h>
-#include <fpa/Filters/Image/Algorithm.h>
-#include <fpa/Filters/Image/DefaultTraits.h>
-#include <fpa/Filters/MarksInterface.h>
-#include <fpa/Filters/SingleSeedInterface.h>
+#include <fpa/Filters/Image/MoriTraits.h>
+#include <fpa/Filters/Image/Interface.h>
 
 namespace fpa
 {
@@ -20,52 +18,29 @@ namespace fpa
       /**
        */
       template< class _TInputImage, class _TOutputImage >
-      class MoriTraits
-        : public fpa::Filters::Image::DefaultTraits< _TInputImage, _TOutputImage, unsigned long >
-      {
-      public:
-        typedef _TInputImage  TInputImage;
-        typedef _TOutputImage TOutputImage;
-        typedef fpa::Filters::Image::DefaultTraits< TInputImage, TOutputImage, unsigned long > Superclass;
-
-        typedef typename Superclass::TInternalTraits TInternalTraits;
-        typedef typename Superclass::TFilter TFilter;
-        typedef fpa::Filters::MarksInterface< TInternalTraits >  TMarksInterface;
-        typedef fpa::Filters::SingleSeedInterface< TInternalTraits > TSeedsInterface;
-      };
-
-      /**
-       */
-      template< class _TInputImage, class _TOutputImage, class _TTraits = fpa::Filters::Image::MoriTraits< _TInputImage, _TOutputImage > >
       class Mori
-        : public fpa::Filters::Image::Algorithm< fpa::Filters::Mori< _TTraits > >
+        : public fpa::Filters::Mori< fpa::Filters::Image::Interface< fpa::Filters::Image::MoriTraits< _TInputImage, _TOutputImage > > >
       {
       public:
-        typedef _TInputImage  TInputImage;
-        typedef _TOutputImage TOutputImage;
-        typedef _TTraits      TTraits;
-        fpaTraitsMacro( typename, TTraits );
+        typedef fpa::Filters::Image::MoriTraits< _TInputImage, _TOutputImage > TTraits;
 
-        typedef fpa::Filters::Mori< TTraits >                TAlgorithm;
-        typedef fpa::Filters::Image::Algorithm< TAlgorithm > Superclass;
-        typedef Mori                                         Self;
-        typedef itk::SmartPointer< Self >                    Pointer;
-        typedef itk::SmartPointer< const Self >              ConstPointer;
+        typedef fpa::Filters::Image::Interface< TTraits > TInterface;
+        typedef fpa::Filters::Mori< TInterface >          Superclass;
+        typedef Mori                                      Self;
+        typedef itk::SmartPointer< Self >                 Pointer;
+        typedef itk::SmartPointer< const Self >           ConstPointer;
 
       public:
         itkNewMacro( Self );
-        itkTypeMacro(
-          fpa::Filters::Image::Mori, fpa::Filters::Image::Algorithm
-          );
 
       protected:
         Mori( );
         virtual ~Mori( );
 
-        virtual void _AfterGenerateData( ) override;
+        // Pipeline related methods
+        virtual void _AfterGenerateData( );
 
       private:
-        // Purposely not implemented.
         Mori( const Self& other );
         Self& operator=( const Self& other );
       };