...

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

diff --git a/lib/fpa/Image/Mori.h b/lib/fpa/Image/Mori.h
index 21c1748b87be65d4cd4eb2db62b83a34dc43f919..b45db506d2c99d21153398215e4857a1c6daac18 100644 (file)
--- a/lib/fpa/Image/Mori.h
+++ b/lib/fpa/Image/Mori.h
@@ -10,6 +10,7 @@
 #include <fpa/Base/MarksInterface.h>
 #include <fpa/Base/SingleSeedInterface.h>
 #include <fpa/Image/Algorithm.h>
+#include <fpa/Image/DefaultTraits.h>
 
 namespace fpa
 {
@@ -17,67 +18,56 @@ namespace fpa
   {
     /**
      */
-    template< class _TInputImage, class _TOutputImage, class _TFrontId = unsigned char >
+    template< class _TInputImage, class _TOutputImage, class _TTraits = fpa::Image::DefaultTraits< _TInputImage, _TOutputImage, typename _TOutputImage::PixelType > >
     class Mori
-      : public fpa::Base::Mori< fpa::Image::Algorithm< _TInputImage, _TOutputImage, fpa::Base::MarksInterface< typename _TInputImage::IndexType >, fpa::Base::SingleSeedInterface< typename _TInputImage::IndexType, typename _TInputImage::PointType, typename _TInputImage::PixelType, typename _TOutputImage::PixelType, _TFrontId, typename _TInputImage::IndexType::LexicographicCompare > > >
+      : public fpa::Base::Mori< fpa::Image::Algorithm< _TTraits, fpa::Base::MarksInterface< _TTraits >, fpa::Base::SingleSeedInterface< _TTraits > > >
     {
     public:
       typedef _TInputImage  TInputImage;
       typedef _TOutputImage TOutputImage;
-      typedef _TFrontId     TFrontId;
-
-      typedef typename TInputImage::IndexType        TVertex;
-      typedef typename TInputImage::PointType        TPoint;
-      typedef typename TVertex::LexicographicCompare TVertexCompare;
-      typedef typename TInputImage::PixelType        TInputValue;
-      typedef typename TOutputImage::PixelType       TOutputValue;
-
-      typedef fpa::Base::MarksInterface< TVertex > TMarksInterface;
-      typedef fpa::Base::SingleSeedInterface< TVertex, TPoint, TInputValue, TOutputValue, TFrontId, TVertexCompare > TSeedsInterface;
-      typedef fpa::Image::Algorithm< TInputImage, TOutputImage, TMarksInterface, TSeedsInterface > TAlgorithm;
+      typedef _TTraits      TTraits;
+      typedef fpa::Base::MarksInterface< _TTraits >      TMarksInterface;
+      typedef fpa::Base::SingleSeedInterface< _TTraits > TSeedsInterface;
+      typedef fpa::Image::Algorithm< TTraits, TMarksInterface, TSeedsInterface > TAlgorithm;
 
       typedef Mori                            Self;
       typedef fpa::Base::Mori< TAlgorithm >   Superclass;
       typedef itk::SmartPointer< Self >       Pointer;
       typedef itk::SmartPointer< const Self > ConstPointer;
 
-      typedef typename TSeedsInterface::TNode  TNode;
-      typedef typename TSeedsInterface::TNodes TNodes;
-      typedef typename TAlgorithm::TMarks      TMarks;
+      typedef typename TAlgorithm::TMarks TMarks;
 
     public:
       itkNewMacro( Self );
       itkTypeMacro( fpa::Image::Mori, fpa::Base::Mori );
 
     public:
-      TMarks* GetOutputLevels( )
-        {
-          return( this->GetMarks( ) );
-        }
-      const TMarks* GetOutputLevels( ) const
-        {
-          return( this->GetMarks( ) );
-        }
+      TOutputImage* GetThresholdedOutput( );
+      const TOutputImage* GetThresholdedOutput( ) const;
 
     protected:
-      Mori( )
-        : Superclass( )
-        {
-        }
-      virtual ~Mori( )
-        {
-        }
+      Mori( );
+      virtual ~Mori( );
+
+      virtual void _AfterGenerateData( ) override;
 
     private:
       // Purposely not implemented.
       Mori( const Self& other );
       Self& operator=( const Self& other );
+
+    protected:
+      unsigned long m_ThresholdedOutputIdx;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include <fpa/Image/Mori.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
+
 #endif // __fpa__Image__Mori__h__
 
 // eof - $RCSfile$