X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h;h=598e15d20b1d717593abdd83cadbe11b8d5d5dd8;hb=4dc9dddd928daeb91104d5c18fa73a02975cedeb;hp=eaabf5a3f271918d6b891b2ac974640eba3f2035;hpb=826a318db2e9b41fbd865e41ebb5906efdefbb02;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h b/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
index eaabf5a..598e15d 100644
--- a/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
+++ b/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h
@@ -1,8 +1,10 @@
 #ifndef __FPA__BASE__EXTRACTENDPOINTSANDBIFURCATIONSFROMMINIMUMSPANNINGTREE__H__
 #define __FPA__BASE__EXTRACTENDPOINTSANDBIFURCATIONSFROMMINIMUMSPANNINGTREE__H__
 
+#include <utility>
 #include <vector>
 #include <itkProcessObject.h>
+#include <itkSimpleDataObjectDecorator.h>
 #include <cpExtensions/DataStructures/ImageIndexesContainer.h>
 
 namespace fpa
@@ -22,7 +24,9 @@ namespace fpa
       typedef itk::SmartPointer< const Self >                        ConstPointer;
 
       typedef _TMST  TMinimumSpanningTree;
-      typedef typename _TMST::TVertex TVertex;
+      typedef typename _TMST::TVertex       TVertex;
+      typedef std::pair< TVertex, TVertex > TBranch;
+      typedef itk::SimpleDataObjectDecorator< std::vector< TBranch > > TBranches;
 
       typedef
       cpExtensions::DataStructures::ImageIndexesContainer< TVertex::Dimension >
@@ -41,8 +45,9 @@ namespace fpa
       TVertices* GetEndPoints( );
       TVertices* GetBifurcations( );
       TVertices* GetCollisions( );
+      TBranches* GetBranches( );
 
-      virtual void Update( ) override
+      virtual void Update( ) ITK_OVERRIDE
         {
           this->GenerateData( );
         }
@@ -51,7 +56,7 @@ namespace fpa
       ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( );
       virtual ~ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( );
 
-      virtual void GenerateData( ) override;
+      virtual void GenerateData( ) ITK_OVERRIDE;
 
       virtual void _MarkSkeleton(
         const TVertex& v, const unsigned long& l