X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FImage%2FExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h;h=002afb4dba3898339455580c24d1d403830f7300;hb=ee47805904ac406cd2433cd9a9a9eeec68d1fc6e;hp=4ad643a6771d48212a79cd1e96eabd8f1176200a;hpb=8fafb83c41ab35dfc25eb637170882a612924433;p=FrontAlgorithms.git

diff --git a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
index 4ad643a..002afb4 100644
--- a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
+++ b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
@@ -2,10 +2,7 @@
 #define __FPA__IMAGE__EXTRACTENDPOINTSANDBIFURCATIONSFROMMINIMUMSPANNINGTREE__H__
 
 #include <fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h>
-
-#include <itkImageFileWriter.h>
-#include <itkImageFileWriter.hxx>
-#include <itkImageAlgorithm.hxx>
+#include <fpa/Base/ImageSkeleton.h>
 
 namespace fpa
 {
@@ -30,6 +27,7 @@ namespace fpa
       typedef typename Superclass::TVertex              TVertex;
 
       typedef itk::Image< unsigned short, TImage::ImageDimension > TMarkImage;
+      typedef fpa::Base::ImageSkeleton< _TMST > TSkeleton;
 
     public:
       itkNewMacro( Self );
@@ -45,6 +43,7 @@ namespace fpa
     public:
       const TImage* GetCostsImage( );
       const TImage* GetDistanceMap( );
+      TSkeleton* GetSkeleton( );
       void SetCostsImage( TImage* image );
       void SetDistanceMap( TImage* image );
 
@@ -52,33 +51,22 @@ namespace fpa
       ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( );
       virtual ~ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( );
 
-      virtual void GenerateData( ) override;
+      virtual void GenerateData( ) ITK_OVERRIDE;
 
       virtual void _MarkSkeleton(
         const TVertex& v, const unsigned long& l
-        ) override;
+        ) ITK_OVERRIDE;
       virtual void _MarkSphere(
         const TVertex& v,
         const double& r,
         const unsigned long& l
-        ) override;
-      virtual unsigned long _Mark( const TVertex& v ) override;
-      virtual unsigned long _SkeletonMark( const TVertex& v ) override;
-      virtual double _Radius( const TVertex& v ) override;
+        ) ITK_OVERRIDE;
+      virtual unsigned long _Mark( const TVertex& v ) ITK_OVERRIDE;
+      virtual unsigned long _SkeletonMark( const TVertex& v ) ITK_OVERRIDE;
+      virtual double _Radius( const TVertex& v ) ITK_OVERRIDE;
 
-      virtual void _Tmp( ) override
+      virtual void _Tmp( ) ITK_OVERRIDE
         {
-          /* TODO
-             static unsigned int i = 0;
-             std::stringstream s;
-             s << "marks_" << i << ".mhd";
-             i++;
-             typename itk::ImageFileWriter< TMarkImage >::Pointer w =
-             itk::ImageFileWriter< TMarkImage >::New( );
-             w->SetInput( this->m_MarkImage );
-             w->SetFileName( s.str( ) );
-             w->Update( );
-          */
         }
 
     private: