...

[FrontAlgorithms.git] / appli / CTBronchi / MoriLabelling.h

diff --git a/appli/CTBronchi/MoriLabelling.h b/appli/CTBronchi/MoriLabelling.h
index eecb4ad52910e2aa11df53acea7a1a79cf8a4268..127ec0fd8c500b7b171930ae38418ee5329fc88b 100644 (file)
--- a/appli/CTBronchi/MoriLabelling.h
+++ b/appli/CTBronchi/MoriLabelling.h
@@ -10,37 +10,32 @@
 #include <fpa/Base/MarksInterface.h>
 #include <fpa/Base/Functors/RegionGrow/BinaryThreshold.h>
 #include <fpa/Image/Algorithm.h>
+#include <fpa/Image/DefaultTraits.h>
 #include <fpa/Image/LabelledSeedsInterface.h>
 
 namespace CTBronchi
 {
   /**
    */
-  template< class _TInputImage, class _TLabelImage >
+  template< class _TInputImage, class _TLabelImage, class _TTraits = fpa::Image::DefaultTraits< _TInputImage, _TLabelImage, typename _TLabelImage::PixelType > >
   class MoriLabelling
-    : public fpa::Base::RegionGrow< fpa::Image::Algorithm< _TInputImage, _TLabelImage, fpa::Base::MarksInterface< typename _TInputImage::IndexType >, fpa::Image::LabelledSeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PointType, typename _TInputImage::PixelType, typename _TLabelImage::PixelType, typename _TLabelImage::PixelType, typename _TInputImage::IndexType::LexicographicCompare > > >
+    : public fpa::Base::RegionGrow< fpa::Image::Algorithm< _TTraits, fpa::Base::MarksInterface< _TTraits >, fpa::Image::LabelledSeedsInterface< _TTraits > > >
   {
   public:
     typedef _TInputImage TInputImage;
     typedef _TLabelImage TLabelImage;
-    typedef typename TInputImage::PixelType TInputValue;
-    typedef typename TInputImage::PointType TPoint;
-    typedef typename TInputImage::IndexType TVertex;
-    typedef typename TLabelImage::PixelType TOutputValue;
-    typedef typename TVertex::LexicographicCompare TVertexCompare;
+    typedef _TTraits     TTraits;
+    fpa_Base_TraitTypes( typename TTraits );
 
-    typedef fpa::Base::MarksInterface< TVertex > TMarksInterface;
-    typedef fpa::Image::LabelledSeedsInterface< TVertex, TPoint, TInputValue, TOutputValue, TOutputValue, TVertexCompare > TSeedsInterface;
-    typedef fpa::Image::Algorithm< TInputImage, TLabelImage, TMarksInterface, TSeedsInterface > TAlgorithm;
+    typedef fpa::Base::MarksInterface< TTraits > TMarksInterface;
+    typedef fpa::Image::LabelledSeedsInterface< TTraits > TSeedsInterface;
+    typedef fpa::Image::Algorithm< TTraits, TMarksInterface, TSeedsInterface > TAlgorithm;
 
     typedef MoriLabelling                       Self;
     typedef fpa::Base::RegionGrow< TAlgorithm > Superclass;
     typedef itk::SmartPointer< Self >           Pointer;
     typedef itk::SmartPointer< const Self >     ConstPointer;
 
-    typedef typename TSeedsInterface::TNode  TNode;
-    typedef typename TSeedsInterface::TNodes TNodes;
-
     typedef fpa::Base::Functors::RegionGrow::BinaryThreshold< TInputValue > TThresholdFunction;
 
   public: