...

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

diff --git a/lib/fpa/Image/RandomWalker.h b/lib/fpa/Image/RandomWalker.h
index 9e41147febb1cc6b9adcb1ec7dcf8ee1a7adf873..5438f007b992133bc021ebd451fd015568ff0d0c 100644 (file)
--- a/lib/fpa/Image/RandomWalker.h
+++ b/lib/fpa/Image/RandomWalker.h
@@ -22,20 +22,21 @@ namespace fpa
      */
     template< class _TInputImage, class _TLabelImage, class _TScalar >
     class RandomWalker
-      : public fpa::Base::DijkstraBase< fpa::Image::Algorithm< _TInputImage, itk::Image< _TScalar, _TInputImage::ImageDimension >, fpa::Base::MarksInterface< typename _TInputImage::IndexType >, fpa::Image::LabelledSeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PixelType, _TScalar, typename _TLabelImage::PixelType, typename _TInputImage::IndexType::LexicographicCompare > > >
+      : public fpa::Base::DijkstraBase< fpa::Image::Algorithm< _TInputImage, itk::Image< _TScalar, _TInputImage::ImageDimension >, fpa::Base::MarksInterface< typename _TInputImage::IndexType >, fpa::Image::LabelledSeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PointType, typename _TInputImage::PixelType, _TScalar, typename _TLabelImage::PixelType, typename _TInputImage::IndexType::LexicographicCompare > > >
     {
     public:
       typedef _TInputImage TInputImage;
       typedef _TLabelImage TLabelImage;
       typedef _TScalar     TScalar;
       typedef typename TInputImage::IndexType        TVertex;
+      typedef typename TInputImage::PointType        TPoint;
       typedef typename TVertex::LexicographicCompare TVertexCompare;
       typedef typename TInputImage::PixelType        TInputValue;
       typedef typename TLabelImage::PixelType        TFrontId;
 
       typedef itk::Image< TScalar, _TInputImage::ImageDimension > TOutputImage;
       typedef fpa::Base::MarksInterface< TVertex > TMarksInterface;
-      typedef fpa::Image::LabelledSeedsInterface< TVertex, TInputValue, _TScalar, TFrontId, TVertexCompare > TSeedsInterface;
+      typedef fpa::Image::LabelledSeedsInterface< TVertex, TPoint, TInputValue, _TScalar, TFrontId, TVertexCompare > TSeedsInterface;
       typedef fpa::Image::Algorithm< _TInputImage, TOutputImage, TMarksInterface, TSeedsInterface > TAlgorithm;
 
       typedef RandomWalker                          Self;
@@ -44,6 +45,8 @@ namespace fpa
       typedef itk::SmartPointer< const Self >       ConstPointer;
 
       typedef fpa::Image::Functors::Dijkstra::Function< TInputImage, TScalar > TWeightFunction;
+      typedef typename TSeedsInterface::TNode  TNode;
+      typedef typename TSeedsInterface::TNodes TNodes;
 
     public:
       itkNewMacro( Self );
@@ -57,7 +60,7 @@ namespace fpa
       virtual ~RandomWalker( );
 
       virtual void _BeforeGenerateData( ) override;
-      virtual void _QueueInit( ) override;
+      virtual TNodes _UnifySeeds( ) override;
 
     private:
       // Purposely not implemented.