From: Leonardo Florez Date: Sun, 10 Apr 2016 11:44:03 +0000 (-0500) Subject: ... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=57a315ceb876d4a26e8a88046f5c6ef87989780a;p=FrontAlgorithms.git ... --- diff --git a/lib/fpa/Base/Algorithm.h b/lib/fpa/Base/Algorithm.h index 4d8570f..94d1ddd 100644 --- a/lib/fpa/Base/Algorithm.h +++ b/lib/fpa/Base/Algorithm.h @@ -109,7 +109,7 @@ namespace fpa virtual ~Algorithm( ); // Connection with itk's pipeline - virtual void GenerateData( ); + virtual void GenerateData( ) ITK_OVERRIDE; // Main loop algorithm virtual void _Loop( ); diff --git a/lib/fpa/Base/Dijkstra.h b/lib/fpa/Base/Dijkstra.h index e711f4f..115447b 100644 --- a/lib/fpa/Base/Dijkstra.h +++ b/lib/fpa/Base/Dijkstra.h @@ -91,19 +91,19 @@ namespace fpa virtual TResult _Cost( const TVertex& v, const TVertex& p ) const = 0; - virtual void _BeforeGenerateData( ); + virtual void _BeforeGenerateData( ) ITK_OVERRIDE; // Results-related abstract methods virtual bool _ComputeNeighborResult( TResult& result, const TVertex& neighbor, const TVertex& parent - ) const; - virtual void _SetResult( const TVertex& v, const _TNode& n ); + ) const ITK_OVERRIDE; + virtual void _SetResult( const TVertex& v, const _TNode& n ) ITK_OVERRIDE; // Queue-related abstract methods - virtual bool _IsQueueEmpty( ) const; - virtual void _QueuePush( const TVertex& v, const _TNode& n ); - virtual void _QueuePop( TVertex& v, _TNode& n ); - virtual void _QueueClear( ); + virtual bool _IsQueueEmpty( ) const ITK_OVERRIDE; + virtual void _QueuePush( const TVertex& v, const _TNode& n ) ITK_OVERRIDE; + virtual void _QueuePop( TVertex& v, _TNode& n ) ITK_OVERRIDE; + virtual void _QueueClear( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h b/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h index eaabf5a..4fc3460 100644 --- a/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h +++ b/lib/fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h @@ -42,7 +42,7 @@ namespace fpa TVertices* GetBifurcations( ); TVertices* GetCollisions( ); - virtual void Update( ) override + virtual void Update( ) ITK_OVERRIDE { this->GenerateData( ); } @@ -51,7 +51,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 diff --git a/lib/fpa/Base/ExtractPathFromMinimumSpanningTree.h b/lib/fpa/Base/ExtractPathFromMinimumSpanningTree.h index 4566077..2c067ad 100644 --- a/lib/fpa/Base/ExtractPathFromMinimumSpanningTree.h +++ b/lib/fpa/Base/ExtractPathFromMinimumSpanningTree.h @@ -47,7 +47,7 @@ namespace fpa ExtractPathFromMinimumSpanningTree( ); virtual ~ExtractPathFromMinimumSpanningTree( ); - virtual void GenerateData( ); + virtual void GenerateData( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Base/Functors/InvertCostFunction.h b/lib/fpa/Base/Functors/InvertCostFunction.h index d1e21f4..22644ad 100644 --- a/lib/fpa/Base/Functors/InvertCostFunction.h +++ b/lib/fpa/Base/Functors/InvertCostFunction.h @@ -34,7 +34,7 @@ namespace fpa itkSetMacro( Beta, C ); public: - virtual C Evaluate( const C& input ) const + virtual C Evaluate( const C& input ) const ITK_OVERRIDE { C a = std::pow( input, this->m_Alpha ); if( input >= C( 0 ) ) diff --git a/lib/fpa/Base/Functors/TautologyFunction.h b/lib/fpa/Base/Functors/TautologyFunction.h index d8eec46..82498d0 100644 --- a/lib/fpa/Base/Functors/TautologyFunction.h +++ b/lib/fpa/Base/Functors/TautologyFunction.h @@ -32,7 +32,7 @@ namespace fpa itkSetConstObjectMacro( Space, TSpace ); public: - virtual bool Evaluate( const TVertex& input ) const + virtual bool Evaluate( const TVertex& input ) const ITK_OVERRIDE { return( true ); } protected: diff --git a/lib/fpa/Base/RegionGrow.h b/lib/fpa/Base/RegionGrow.h index 0a1e938..8bc2776 100644 --- a/lib/fpa/Base/RegionGrow.h +++ b/lib/fpa/Base/RegionGrow.h @@ -71,13 +71,13 @@ namespace fpa // Results-related abstract methods virtual bool _ComputeNeighborResult( TResult& result, const TVertex& neighbor, const TVertex& parent - ) const; + ) const ITK_OVERRIDE; // Queue-related abstract methods - virtual bool _IsQueueEmpty( ) const; - virtual void _QueuePush( const TVertex& v, const _TNode& n ); - virtual void _QueuePop( TVertex& v, _TNode& n ); - virtual void _QueueClear( ); + virtual bool _IsQueueEmpty( ) const ITK_OVERRIDE; + virtual void _QueuePush( const TVertex& v, const _TNode& n ) ITK_OVERRIDE; + virtual void _QueuePop( TVertex& v, _TNode& n ) ITK_OVERRIDE; + virtual void _QueueClear( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h index dce2d25..6d68bb5 100644 --- a/lib/fpa/Image/Algorithm.h +++ b/lib/fpa/Image/Algorithm.h @@ -54,23 +54,23 @@ namespace fpa Algorithm( ); virtual ~Algorithm( ); - virtual void _BeforeGenerateData( ); + virtual void _BeforeGenerateData( ) ITK_OVERRIDE; // Graph-related abstract methods - virtual unsigned long _NumberOfVertices( ) const; - virtual const TValue& _VertexValue( const TVertex& v ) const; + virtual unsigned long _NumberOfVertices( ) const ITK_OVERRIDE; + virtual const TValue& _VertexValue( const TVertex& v ) const ITK_OVERRIDE; virtual double _Distance( const TVertex& a, const TVertex& b - ) const; - virtual bool _HasEdge( const TVertex& a, const TVertex& b ) const; + ) const ITK_OVERRIDE; + virtual bool _HasEdge( const TVertex& a, const TVertex& b ) const ITK_OVERRIDE; virtual void _Neighborhood( _TVertices& neighborhood, const TVertex& v - ) const; + ) const ITK_OVERRIDE; // Results-related abstract methods - virtual void _InitResults( ); - virtual const TResult& _Result( const TVertex& v ) const; - virtual void _SetResult( const TVertex& v, const _TNode& n ); + virtual void _InitResults( ) ITK_OVERRIDE; + virtual const TResult& _Result( const TVertex& v ) const ITK_OVERRIDE; + virtual void _SetResult( const TVertex& v, const _TNode& n ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Image/Dijkstra.h b/lib/fpa/Image/Dijkstra.h index 7ff5908..f4da123 100644 --- a/lib/fpa/Image/Dijkstra.h +++ b/lib/fpa/Image/Dijkstra.h @@ -76,11 +76,11 @@ namespace fpa Dijkstra( ); virtual ~Dijkstra( ); - virtual TResult _Cost( const TVertex& v, const TVertex& p ) const; + virtual TResult _Cost( const TVertex& v, const TVertex& p ) const ITK_OVERRIDE; - virtual void _BeforeGenerateData( ); - virtual void _AfterGenerateData( ); - virtual void _InitResults( ); + virtual void _BeforeGenerateData( ) ITK_OVERRIDE; + virtual void _AfterGenerateData( ) ITK_OVERRIDE; + virtual void _InitResults( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h index 9fd6c88..312da36 100644 --- a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h +++ b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h @@ -48,21 +48,21 @@ 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 { } diff --git a/lib/fpa/Image/Functors/RegionGrowAllBelongsFunction.h b/lib/fpa/Image/Functors/RegionGrowAllBelongsFunction.h index 362304f..8aef295 100644 --- a/lib/fpa/Image/Functors/RegionGrowAllBelongsFunction.h +++ b/lib/fpa/Image/Functors/RegionGrowAllBelongsFunction.h @@ -33,7 +33,7 @@ namespace fpa itkTypeMacro( RegionGrowAllBelongsFunction, itkImageFunction ); public: - virtual bool Evaluate( const TIndex& v ) const + virtual bool Evaluate( const TIndex& v ) const ITK_OVERRIDE { return( true ); } protected: diff --git a/lib/fpa/Image/RegionGrow.h b/lib/fpa/Image/RegionGrow.h index 14d2f1c..59e97da 100644 --- a/lib/fpa/Image/RegionGrow.h +++ b/lib/fpa/Image/RegionGrow.h @@ -51,7 +51,7 @@ namespace fpa RegionGrow( ); virtual ~RegionGrow( ); - virtual void _InitResults( ); + virtual void _InitResults( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/VTK/Image2DObserver.h b/lib/fpa/VTK/Image2DObserver.h index 0d95658..c70b2af 100644 --- a/lib/fpa/VTK/Image2DObserver.h +++ b/lib/fpa/VTK/Image2DObserver.h @@ -49,9 +49,9 @@ namespace fpa unsigned char alpha ); void Render( ); - void Execute( itk::Object* c, const itk::EventObject& e ) + void Execute( itk::Object* c, const itk::EventObject& e ) ITK_OVERRIDE { this->Execute( ( const itk::Object* )( c ), e ); } - void Execute( const itk::Object* c, const itk::EventObject& e ); + void Execute( const itk::Object* c, const itk::EventObject& e ) ITK_OVERRIDE; protected: Image2DObserver( ); diff --git a/lib/fpa/VTK/Image3DObserver.h b/lib/fpa/VTK/Image3DObserver.h index f9c123b..a237696 100644 --- a/lib/fpa/VTK/Image3DObserver.h +++ b/lib/fpa/VTK/Image3DObserver.h @@ -44,9 +44,9 @@ namespace fpa public: void SetRenderWindow( R* rw ); void Render( ); - void Execute( itk::Object* c, const itk::EventObject& e ) + void Execute( itk::Object* c, const itk::EventObject& e ) ITK_OVERRIDE { this->Execute( ( const itk::Object* )( c ), e ); } - void Execute( const itk::Object* c, const itk::EventObject& e ); + void Execute( const itk::Object* c, const itk::EventObject& e ) ITK_OVERRIDE; protected: Image3DObserver( ); diff --git a/lib/fpa_Instances/CMakeLists.txt b/lib/fpa_Instances/CMakeLists.txt index d9fe125..17d6826 100644 --- a/lib/fpa_Instances/CMakeLists.txt +++ b/lib/fpa_Instances/CMakeLists.txt @@ -44,7 +44,7 @@ SET( ) ## Target links -TARGET_LINK_LIBRARIES(fpa_Instances ${cpPlugins_LIBRARY} ${cpPlugins_ALL_INSTANCES_LIBRARIES}) +TARGET_LINK_LIBRARIES(fpa_Instances ${cpPlugins_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES}) TARGET_LINK_LIBRARIES(fpa_Filters fpa_Instances) TARGET_LINK_LIBRARIES(fpa_Observers fpa_Filters) diff --git a/lib/fpa_Instances/Filters.i b/lib/fpa_Instances/Filters.i index 28b3ac7..0dfb9ff 100644 --- a/lib/fpa_Instances/Filters.i +++ b/lib/fpa_Instances/Filters.i @@ -3,6 +3,9 @@ f fpa_Instances/Instances.h t fpa/Image/RegionGrow.h t fpa/Image/Dijkstra.h t fpa/Image/Algorithm.h +t fpa/Base/Algorithm.h +t fpa/Base/RegionGrow.h +t fpa/Base/Dijkstra.h d #dims=2;3 d #int=char;short;int;long diff --git a/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h b/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h index 8e32467..5b85ca5 100644 --- a/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h +++ b/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h @@ -32,7 +32,7 @@ namespace fpaPlugins ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( ); virtual ~ExtractEndPointsAndBifurcationsFromMinimumSpanningTree( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TImage > inline std::string _GD0( _TImage* image ); diff --git a/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx b/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx index d914d6a..db5332a 100644 --- a/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx +++ b/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/plugins/fpa/ExtractPathFromMinimumSpanningTree.h b/plugins/fpa/ExtractPathFromMinimumSpanningTree.h index 313f67e..d0d407b 100644 --- a/plugins/fpa/ExtractPathFromMinimumSpanningTree.h +++ b/plugins/fpa/ExtractPathFromMinimumSpanningTree.h @@ -30,7 +30,7 @@ namespace fpaPlugins ExtractPathFromMinimumSpanningTree( ); virtual ~ExtractPathFromMinimumSpanningTree( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TMST > inline std::string _GD0( _TMST* mst ); diff --git a/plugins/fpa/ImageDijkstra.h b/plugins/fpa/ImageDijkstra.h index bc34724..cb5b411 100644 --- a/plugins/fpa/ImageDijkstra.h +++ b/plugins/fpa/ImageDijkstra.h @@ -25,7 +25,7 @@ namespace fpaPlugins ImageDijkstra( ); virtual ~ImageDijkstra( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TImage > std::string _GD0( _TImage* image ); diff --git a/plugins/fpa/ImageRegionGrow.h b/plugins/fpa/ImageRegionGrow.h index 6c680fb..be156c5 100644 --- a/plugins/fpa/ImageRegionGrow.h +++ b/plugins/fpa/ImageRegionGrow.h @@ -25,7 +25,7 @@ namespace fpaPlugins ImageRegionGrow( ); virtual ~ImageRegionGrow( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TImage > std::string _GD0( _TImage* image ); diff --git a/plugins/fpa/InvertCostFunction.h b/plugins/fpa/InvertCostFunction.h index a0a9c90..f65c44a 100644 --- a/plugins/fpa/InvertCostFunction.h +++ b/plugins/fpa/InvertCostFunction.h @@ -26,7 +26,7 @@ namespace fpaPlugins InvertCostFunction( ); virtual ~InvertCostFunction( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TScalar > std::string _GD0( );