From: Leonardo Florez Date: Mon, 11 Apr 2016 23:38:41 +0000 (-0500) Subject: ... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=aee6d0fd1de25708d140dcc38b4d61dd2651b73c;p=FrontAlgorithms.git ... --- diff --git a/lib/fpa/IO/MinimumSpanningTreeReader.h b/lib/fpa/IO/MinimumSpanningTreeReader.h index d0cbef3..0430ad9 100644 --- a/lib/fpa/IO/MinimumSpanningTreeReader.h +++ b/lib/fpa/IO/MinimumSpanningTreeReader.h @@ -31,13 +31,13 @@ namespace fpa public: _TTree* GetOutput( ); - virtual void Update( ); + virtual void Update( ) ITK_OVERRIDE; protected: MinimumSpanningTreeReader( ); virtual ~MinimumSpanningTreeReader( ); - virtual void GenerateData( ); + virtual void GenerateData( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/IO/MinimumSpanningTreeWriter.h b/lib/fpa/IO/MinimumSpanningTreeWriter.h index c3465fa..0b384fc 100644 --- a/lib/fpa/IO/MinimumSpanningTreeWriter.h +++ b/lib/fpa/IO/MinimumSpanningTreeWriter.h @@ -33,13 +33,13 @@ namespace fpa void SetInput( const _TTree* input ); _TTree* GetInput( ); const _TTree* GetInput( ) const; - virtual void Update( ); + virtual void Update( ) ITK_OVERRIDE; protected: MinimumSpanningTreeWriter( ); virtual ~MinimumSpanningTreeWriter( ); - virtual void GenerateData( ); + virtual void GenerateData( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/fpa/Image/Functors/FluxMedialness.h b/lib/fpa/Image/Functors/FluxMedialness.h index 1995040..4aa7e8a 100644 --- a/lib/fpa/Image/Functors/FluxMedialness.h +++ b/lib/fpa/Image/Functors/FluxMedialness.h @@ -49,7 +49,7 @@ namespace fpa FluxMedialness( ); virtual ~FluxMedialness( ); - virtual TOutput _Evaluate( const TIndex& i ) const; + virtual TOutput _Evaluate( const TIndex& i ) const ITK_OVERRIDE; private: // Purposely not implemented. diff --git a/lib/fpa/Image/Functors/GradientImageFunctionBase.h b/lib/fpa/Image/Functors/GradientImageFunctionBase.h index 0b53f11..fa93034 100644 --- a/lib/fpa/Image/Functors/GradientImageFunctionBase.h +++ b/lib/fpa/Image/Functors/GradientImageFunctionBase.h @@ -42,9 +42,9 @@ namespace fpa public: virtual void Prepare( ) const; - virtual TOutput Evaluate( const TPoint& p ) const; - virtual TOutput EvaluateAtIndex( const TIndex& i ) const; - virtual TOutput EvaluateAtContinuousIndex( const TContIndex& i ) const; + virtual TOutput Evaluate( const TPoint& p ) const ITK_OVERRIDE; + virtual TOutput EvaluateAtIndex( const TIndex& i ) const ITK_OVERRIDE; + virtual TOutput EvaluateAtContinuousIndex( const TContIndex& i ) const ITK_OVERRIDE; protected: GradientImageFunctionBase( ); diff --git a/lib/fpa/Image/Functors/GulsunTekMedialness.h b/lib/fpa/Image/Functors/GulsunTekMedialness.h index 81ea1d5..4a26aab 100644 --- a/lib/fpa/Image/Functors/GulsunTekMedialness.h +++ b/lib/fpa/Image/Functors/GulsunTekMedialness.h @@ -51,7 +51,7 @@ namespace fpa GulsunTekMedialness( ); virtual ~GulsunTekMedialness( ); - virtual TOutput _Evaluate( const TIndex& i ) const; + virtual TOutput _Evaluate( const TIndex& i ) const ITK_OVERRIDE; private: // Purposely not implemented. diff --git a/lib/fpa/Image/Functors/MFluxMedialness.h b/lib/fpa/Image/Functors/MFluxMedialness.h index 76efda3..d109ea8 100644 --- a/lib/fpa/Image/Functors/MFluxMedialness.h +++ b/lib/fpa/Image/Functors/MFluxMedialness.h @@ -49,7 +49,7 @@ namespace fpa MFluxMedialness( ); virtual ~MFluxMedialness( ); - virtual TOutput _Evaluate( const TIndex& i ) const; + virtual TOutput _Evaluate( const TIndex& i ) const ITK_OVERRIDE; private: // Purposely not implemented. diff --git a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h index 55a5d53..4ec4bbf 100644 --- a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h +++ b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h @@ -42,7 +42,7 @@ namespace fpa itkSetMacro( UpperThreshold, TPixel ); public: - virtual bool Evaluate( const TIndex& idx ) const + virtual bool Evaluate( const TIndex& idx ) const ITK_OVERRIDE { const I* img = this->GetSpace( ); diff --git a/lib/fpa_Instances/CMakeLists.txt b/lib/fpa_Instances/CMakeLists.txt index b0c5525..9a51432 100644 --- a/lib/fpa_Instances/CMakeLists.txt +++ b/lib/fpa_Instances/CMakeLists.txt @@ -5,11 +5,11 @@ SET(pfx "fpa_") SET(arg ${pfx} ${prj_VER} ${prj_sVER}) -cpPlugins_WrapInstances(Instances ${arg} ${cpPlugins_LIBRARIES}) +cpPlugins_WrapInstances(Instances ${arg} ${cpPlugins_LIBRARIES} ${ITK_LIBRARIES}) cpPlugins_WrapInstances(Functors ${arg} ${pfx}Instances) cpPlugins_WrapInstances(Filters ${arg} ${pfx}Instances) cpPlugins_WrapInstances(Backtracking ${arg} ${pfx}Instances) -cpPlugins_WrapInstances(Observers ${arg} ${pfx}Filters) +cpPlugins_WrapInstances(Observers ${arg} ${pfx}Filters ${VTK_LIBRARIES}) SET( fpa_LIBRARIES diff --git a/lib/fpa_Instances/Filters.i b/lib/fpa_Instances/Filters.i index 6452df0..d4269e9 100644 --- a/lib/fpa_Instances/Filters.i +++ b/lib/fpa_Instances/Filters.i @@ -31,6 +31,8 @@ c #b::Algorithm< itk::Index< #dims >, #inputs, #outputs, itk::Image< #inputs, #d c #i::Algorithm< itk::Image< #rg_ins, #dims >, itk::Image< #rg_outs, #dims >, fpa::Base::RegionGrow< itk::Index< #dims >, #rg_ins, #rg_outs, itk::Image< #rg_ins, #dims >, itk::Functor::IndexLexicographicCompare< #dims >, itk::ImageToImageFilter< itk::Image< #rg_ins, #dims >, itk::Image< #rg_outs, #dims > > > > +c #b::Dijkstra< itk::Index< #dims >, #d_ins, #d_outs, itk::Image< #d_ins, #dims >, itk::Functor::IndexLexicographicCompare< #dims >, #i::MinimumSpanningTree< #dims >, itk::ImageToImageFilter< itk::Image< #d_ins, #dims >, itk::Image< #d_outs, #dims > > > + * ====================== * == Image algorithms == * ====================== diff --git a/plugins/fpa/MinimumSpanningTreeReader.h b/plugins/fpa/MinimumSpanningTreeReader.h index 8e81c4d..b8f3d27 100644 --- a/plugins/fpa/MinimumSpanningTreeReader.h +++ b/plugins/fpa/MinimumSpanningTreeReader.h @@ -26,7 +26,7 @@ namespace fpaPlugins MinimumSpanningTreeReader( ); virtual ~MinimumSpanningTreeReader( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< unsigned int _NDim > inline std::string _GD0( const std::string& fname ); diff --git a/plugins/fpa/MinimumSpanningTreeWriter.h b/plugins/fpa/MinimumSpanningTreeWriter.h index 60600e6..286e1de 100644 --- a/plugins/fpa/MinimumSpanningTreeWriter.h +++ b/plugins/fpa/MinimumSpanningTreeWriter.h @@ -26,7 +26,7 @@ namespace fpaPlugins MinimumSpanningTreeWriter( ); virtual ~MinimumSpanningTreeWriter( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TTree > inline std::string _GD0( _TTree* tree ); diff --git a/plugins/fpa/RegionGrowThresholdFunction.h b/plugins/fpa/RegionGrowThresholdFunction.h index 2f9694a..5a9c016 100644 --- a/plugins/fpa/RegionGrowThresholdFunction.h +++ b/plugins/fpa/RegionGrowThresholdFunction.h @@ -28,7 +28,7 @@ namespace fpaPlugins RegionGrowThresholdFunction( ); virtual ~RegionGrowThresholdFunction( ); - virtual std::string _GenerateData( ); + virtual std::string _GenerateData( ) ITK_OVERRIDE; template< class _TImage > std::string _GD0( _TImage* image );