...

diff --git a/lib/fpa/Base/Algorithm.h b/lib/fpa/Base/Algorithm.h
index 4d8570f29d55cb95fc2b721f90b53e3fbae04d42..94d1ddd353ef8cdbf73a3fd7e53e3b12467fe687 100644 (file)
--- 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 e711f4f56c844cde21766d47a6c2e789683737a4..115447be0e37bc2809091ac405a45d032088fc74 100644 (file)
--- 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 eaabf5a3f271918d6b891b2ac974640eba3f2035..4fc346070766ae6cd0330ff86b658defdfc46930 100644 (file)
--- 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 4566077353363f9ae1e8219fb25c57cbc0713507..2c067adddf45b4b5fc682804e8b5c6d1fc5f95cb 100644 (file)
--- 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 d1e21f4b1cf979ce91b601f6fd1e8411e6f94271..22644adb38d9ef4c70f3c0b4052b3bda719c7ea2 100644 (file)
--- 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 d8eec46b9b5ce1aaa6aeb8456c48cdb7877c9482..82498d08429d52304bdce2785743a633a48c1da6 100644 (file)
--- 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 0a1e9380113d2413af7dbdb77e23a18b58a3b472..8bc2776420f6a59d17dfa207d59bd2cb351b4829 100644 (file)
--- 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 dce2d251ea9076c779f1c20d251630896cfd3496..6d68bb58786aa9703a44d9c37da518be7fc4e584 100644 (file)
--- 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 7ff59081345767d8badac5218e47ab850f787a92..f4da12311e397fb839c18209c31ff19475a108e0 100644 (file)
--- 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 9fd6c88b6ffdf4762cfa5e5d192f5318f697ded5..312da367f18ad8d2bdc0c47828843410aabb9bf6 100644 (file)
--- 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 362304fc07233a20c86d0be5db6834fa6e7266a6..8aef295874a7707fd566f95f29913e9570e7ef1e 100644 (file)
--- 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 14d2f1c41994b216745d3e460e02b0927504346a..59e97da5eff08a0135853e1587f3d2182f611cf7 100644 (file)
--- 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 0d956581ce727abda5c291215fa6ab56bba2112d..c70b2afb2a1311df2bba4b004f1877ff87aa546b 100644 (file)
--- 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 f9c123bece9f777fa3cb1d579125c57b1100f12d..a237696f58bcae818b08e79f0e0f5e6b3fc305df 100644 (file)
--- 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 d9fe125f9f7d7d37834d6d0968720672a2c63b4f..17d682643fac2b9d7f48180ead09018d5cf355e5 100644 (file)
--- 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 28b3ac78814f263395df0959471b1dc389052cac..0dfb9fffdce74da8c65d5844974176c7cd726d11 100644 (file)
--- 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 8e324670a062cc7ad2b55bc6c8803c51241ba3b2..5b85ca5b402e2038b444eac9f5d3bb14770a9006 100644 (file)
--- 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 d914d6aa39a1777c0511dee1b57ecfddaa26f2e3..db5332a18e9a3d5818534989c31c060809ea867f 100644 (file)
--- a/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx
+++ b/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx
@@ -4,6 +4,8 @@
 #include <itkDataObject.h>
 #include <itkIndex.h>
 #include <itkSimpleDataObjectDecorator.hxx>
+#include <itkVectorContainer.hxx>
+#include <itkParametricPath.hxx>
 #include <cpPlugins_Instances/Paths.h>
 #include <cpPlugins/Path.h>
 #include <fpa/Base/ExtractPathFromMinimumSpanningTree.h>

diff --git a/plugins/fpa/ExtractPathFromMinimumSpanningTree.h b/plugins/fpa/ExtractPathFromMinimumSpanningTree.h
index 313f67e1871f4670c2b60d25b59b98ec523af16d..d0d407b7f15e6171e93c0a2ae27e90e7eaac41c4 100644 (file)
--- 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 bc3472420bbb5d8a89a4c177c20d33bb93a59b47..cb5b411b8b242401b175def7ccae52d79f1df91d 100644 (file)
--- 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 6c680fbabfef4961e6277bfa54067e131fc663d4..be156c526bddd72a07fa8b03237ebc9b238bea95 100644 (file)
--- 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 a0a9c9040febfd7bf9962553821d60c956125ec5..f65c44aec25299b5ae8b4d587d552256cd6eedb2 100644 (file)
--- 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( );