...

diff --git a/appli/CTArteries/CTArteries.cxx b/appli/CTArteries/CTArteries.cxx
index 8b8a3331e315ac69f8d702e8e994634d9c1debe1..54b8aeb8908f73f6cb2e223aa2abf02a9b6e145a 100644 (file)
--- a/appli/CTArteries/CTArteries.cxx
+++ b/appli/CTArteries/CTArteries.cxx
@@ -642,7 +642,7 @@ _CPR(
 
   typename _TFilter::Pointer cpr = _TFilter::New( );
   cpr->SetInput( input );
-  cpr->SetCurve( curve );
+  cpr->SetInputCurve( curve );
   cpr->SetSliceRadius( 40 );
   cpr->Update( );
   output = cpr->GetOutput( );

diff --git a/appli/CTArteries/CTArteries.h b/appli/CTArteries/CTArteries.h
index b3e97c53e2225773045716aeb2f9fe212fcb1598..90d9e09987e5e0d1ee4731a0ebf433299e9e230f 100644 (file)
--- a/appli/CTArteries/CTArteries.h
+++ b/appli/CTArteries/CTArteries.h
@@ -13,7 +13,7 @@
 
 #include <ivq/ITK/Simple3DCurve.h>
 
-#include <fpa/DataStructures/Image/Path.h>
+#include <ivq/ITK/ImagePath.h>
 
 #include "FourierSeries.h"
 
@@ -55,7 +55,7 @@ public:
 
   typedef itk::ImageToVTKImageFilter< TImage >       TVTKImage;
   typedef itk::ImageToVTKImageFilter< TScalarImage > TVTKScalarImage;
-  typedef fpa::DataStructures::Image::Path< Dim >    TAxis;
+  typedef ivq::ITK::ImagePath< Dim >                 TAxis;
   typedef ivq::ITK::Simple3DCurve< TScalar >         TCurve;
   typedef FourierSeries< TScalar, 2 >                TFourier;
 

diff --git a/appli/CTArteries/algorithms/RandomWalkLabelling.h b/appli/CTArteries/algorithms/RandomWalkLabelling.h
index 1f3602a7e7e553e1884b56c5855918690ad2ab85..3661cd43ec90a4713cbe29392928a198782058a5 100644 (file)
--- a/appli/CTArteries/algorithms/RandomWalkLabelling.h
+++ b/appli/CTArteries/algorithms/RandomWalkLabelling.h
@@ -4,7 +4,7 @@
 #ifndef __RandomWalkLabelling__h__
 #define __RandomWalkLabelling__h__
 
-#include <fpa/DataStructures/Image/Path.h>
+#include <ivq/ITK/ImagePath.h>
 #include <fpa/Filters/Image/RegionGrow.h>
 
 /**
@@ -25,7 +25,7 @@ public:
   typedef itk::SmartPointer< Self >       Pointer;
   typedef itk::SmartPointer< const Self > ConstPointer;
 
-  typedef fpa::DataStructures::Image::Path< TRawImage::ImageDimension > TPath;
+  typedef ivq::ITK::ImagePath< TRawImage::ImageDimension > TPath;
 
   typedef typename Superclass::TTraits TTraits;
   fpaTraitsMacro( typename TTraits );
@@ -55,8 +55,8 @@ public:
   itkGetConstMacro( MaxCost, TScalar );
   itkSetMacro( MaxCost, TScalar );
 
-  fpaFilterInputMacro( InputCosts, TCostsImage );
-  fpaFilterInputMacro( InputPath, TPath );
+  ivqITKInputMacro( InputCosts, TCostsImage );
+  ivqITKInputMacro( InputPath, TPath );
 
 public:
   void SetInputImage( const TRawImage* i );

diff --git a/appli/CTArteries/algorithms/RandomWalkLabelling.hxx b/appli/CTArteries/algorithms/RandomWalkLabelling.hxx
index de662f1e2f533a2c8f64d740391b2312a57696dc..28e7a47f6a9c1e58c7174bfe395c77d2a337c9dc 100644 (file)
--- a/appli/CTArteries/algorithms/RandomWalkLabelling.hxx
+++ b/appli/CTArteries/algorithms/RandomWalkLabelling.hxx
@@ -63,8 +63,8 @@ RandomWalkLabelling( )
     m_UpperThreshold( double( 0 ) ),
     m_MaxCost( std::numeric_limits< TScalar >::max( ) )
 {
-  fpaFilterInputConfigureMacro( InputCosts, TCostsImage );
-  fpaFilterInputConfigureMacro( InputPath, TPath );
+  ivqITKInputConfigureMacro( InputCosts, TCostsImage );
+  ivqITKInputConfigureMacro( InputPath, TPath );
   this->SetOutsideLabel( TLabel( 2 ) );
 }
 

diff --git a/appli/CTArteries/algorithms/RandomWalkSegmentation.h b/appli/CTArteries/algorithms/RandomWalkSegmentation.h
index b7199decdaee3ce4fbe5f0c751c1fd884a2b0f54..eaef1deeae56d515f857a8c651f5a45a687aa2bd 100644 (file)
--- a/appli/CTArteries/algorithms/RandomWalkSegmentation.h
+++ b/appli/CTArteries/algorithms/RandomWalkSegmentation.h
@@ -6,7 +6,7 @@
 
 #include <itkImageToImageFilter.h>
 #include <fpa/Config.h>
-#include <fpa/DataStructures/Image/Path.h>
+#include <ivq/ITK/ImagePath.h>
 
 /**
  */
@@ -32,7 +32,7 @@ public:
     TPoint Point;
     bool IsPoint;
   };
-  typedef fpa::DataStructures::Image::Path< TInputImage::ImageDimension > TPath;
+  typedef ivq::ITK::ImagePath< TInputImage::ImageDimension > TPath;
 
 public:
   itkNewMacro( Self );
@@ -50,7 +50,7 @@ public:
   itkGetConstMacro( Radius, double );
   itkSetMacro( Radius, double );
 
-  fpaFilterOutputMacro( OutputAxis, TPath );
+  ivqITKOutputMacro( OutputAxis, TPath );
 
 public:
   void AddSeed( const TIndex& s );

diff --git a/appli/CTArteries/algorithms/RandomWalkSegmentation.hxx b/appli/CTArteries/algorithms/RandomWalkSegmentation.hxx
index 30738e96e92ba2e6d75e0d6fa6aff3d9b4513031..994e98c9ee9242353259f653f4b385ca9bcc9686 100644 (file)
--- a/appli/CTArteries/algorithms/RandomWalkSegmentation.hxx
+++ b/appli/CTArteries/algorithms/RandomWalkSegmentation.hxx
@@ -104,7 +104,7 @@ RandomWalkSegmentation( )
     m_Sigma( double( 10 ) ),
     m_Radius( double( 5 ) )
 {
-  fpaFilterOutputConfigureMacro( OutputAxis, TPath );
+  ivqITKOutputConfigureMacro( OutputAxis, TPath );
 }
 
 // -------------------------------------------------------------------------

diff --git a/appli/CTBronchi/MoriLabelling.cxx b/appli/CTBronchi/MoriLabelling.cxx
index 78544b5ed98b094493c71e849f4c26e09721e9bb..848bf6d49f6009665004358f91322c5c2d76e135 100644 (file)
--- a/appli/CTBronchi/MoriLabelling.cxx
+++ b/appli/CTBronchi/MoriLabelling.cxx
@@ -67,8 +67,8 @@ public:
   itkGetConstMacro( MinVertex, TVertex );
   itkGetConstMacro( MaxVertex, TVertex );
 
-  fpaFilterInputMacro( InputLabels, TLabels );
-  fpaFilterInputMacro( InputVesselness, TScalarImage );
+  ivqITKInputMacro( InputLabels, TLabels );
+  ivqITKInputMacro( InputVesselness, TScalarImage );
 
 public:
   TInputValue GetUpperThreshold( ) const
@@ -86,8 +86,8 @@ protected:
     m_LastThreshold( TInputValue( 0 ) ),
     m_VesselnessThr( TScalar( 0.05 ) )
     {
-      fpaFilterInputConfigureMacro( InputLabels, TLabels );
-      fpaFilterInputConfigureMacro( InputVesselness, TScalarImage );
+      ivqITKInputConfigureMacro( InputLabels, TLabels );
+      ivqITKInputConfigureMacro( InputVesselness, TScalarImage );
       this->m_Functor = TFunctor::New( );
       this->SetPredicate( this->m_Functor );
     }

diff --git a/examples/image/Dijkstra/ExtractAxis.cxx b/examples/image/Dijkstra/ExtractAxis.cxx
index 6d94caecde3e6823b6513b5af5b29219abdc4a3d..3826de0077fc12b20c4da2e8adffa03d9c669dd1 100644 (file)
--- a/examples/image/Dijkstra/ExtractAxis.cxx
+++ b/examples/image/Dijkstra/ExtractAxis.cxx
@@ -5,7 +5,7 @@
 
 #include <itkImage.h>
 #include <itkImageFileReader.h>
-#include <fpa/Common/Image/PathWriter.h>
+#include <ivq/ITK/ImagePathWriter.h>
 #include <fpa/Filters/Image/ExtractAxis.h>
 
 // -------------------------------------------------------------------------
@@ -59,7 +59,7 @@ int main( int argc, char* argv[] )
   filter->Update( );
 
   // Save results
-  typedef fpa::Common::Image::PathWriter< TFilter::TPath > TPathWriter;
+  typedef ivq::ITK::ImagePathWriter< TFilter::TPath > TPathWriter;
   TPathWriter::Pointer path_writer = TPathWriter::New( );
   path_writer->SetInput( filter->GetOutput( ) );
   path_writer->SetFileName( output_path_filename );

diff --git a/examples/image/Dijkstra/ExtractSkeleton.cxx b/examples/image/Dijkstra/ExtractSkeleton.cxx
index 9984de9024640402f5466ec36b1c48600d4b2b88..636b5fbde5ffb82f4a440f3d11ab01910422a8f7 100644 (file)
--- a/examples/image/Dijkstra/ExtractSkeleton.cxx
+++ b/examples/image/Dijkstra/ExtractSkeleton.cxx
@@ -5,7 +5,7 @@
 
 #include <itkImage.h>
 #include <itkImageFileReader.h>
-#include <fpa/Common/Image/SkeletonWriter.h>
+#include <ivq/ITK/ImageSkeletonWriter.h>
 #include <fpa/Filters/Image/ExtractSkeleton.h>
 
 // -------------------------------------------------------------------------
@@ -61,7 +61,7 @@ int main( int argc, char* argv[] )
   filter->Update( );
 
   // Save results
-  typedef fpa::Common::Image::SkeletonWriter< TFilter::TSkeleton > TSkeletonWriter;
+  typedef ivq::ITK::ImageSkeletonWriter< TFilter::TSkeleton > TSkeletonWriter;
   TSkeletonWriter::Pointer skeleton_writer = TSkeletonWriter::New( );
   skeleton_writer->SetInput( filter->GetOutput( ) );
   skeleton_writer->SetFileName( output_skeleton_filename );

diff --git a/lib/fpa/Common/RandomWalker.h b/lib/fpa/Common/RandomWalker.h
index 6a4afa54640d6b8dbc1a97b7335e55a280e37f79..6a703407f7757a76837527f46c930adc9a45bed8 100644 (file)
--- a/lib/fpa/Common/RandomWalker.h
+++ b/lib/fpa/Common/RandomWalker.h
@@ -75,8 +75,8 @@ namespace fpa
       itkGetObjectMacro( EdgeFunction, TEdgeFunction );
       itkSetObjectMacro( EdgeFunction, TEdgeFunction );
 
-      fpaFilterInputMacro( InputLabels, TLabels );
-      fpaFilterOutputMacro( OutputProbabilities, TScalarImage );
+      ivqITKInputMacro( InputLabels, TLabels );
+      ivqITKOutputMacro( OutputProbabilities, TScalarImage );
 
     protected:
       RandomWalker( );

diff --git a/lib/fpa/Common/RandomWalker.hxx b/lib/fpa/Common/RandomWalker.hxx
index a79873500d9bd10d62403b3ae1735df0bd8757de..39bfdd0e65aa60b7e951d9a80c07a9a550bbdd85 100644 (file)
--- a/lib/fpa/Common/RandomWalker.hxx
+++ b/lib/fpa/Common/RandomWalker.hxx
@@ -17,8 +17,8 @@ fpa::Common::RandomWalker< _TImage, _TLabels, _TScalar >::
 RandomWalker( )
   : Superclass( )
 {
-  fpaFilterInputConfigureMacro( InputLabels, TLabels );
-  fpaFilterOutputConfigureMacro( OutputProbabilities, TScalarImage );
+  ivqITKInputConfigureMacro( InputLabels, TLabels );
+  ivqITKOutputConfigureMacro( OutputProbabilities, TScalarImage );
 }
 
 // -------------------------------------------------------------------------

diff --git a/lib/fpa/Filters/Dijkstra.h b/lib/fpa/Filters/Dijkstra.h
index 9356ed8c1bb6aa2ac2bfe09d5c314a43be79030e..d9c5b1784fcac0618e137be77aadb3713da46efe 100644 (file)
--- a/lib/fpa/Filters/Dijkstra.h
+++ b/lib/fpa/Filters/Dijkstra.h
@@ -36,7 +36,7 @@ namespace fpa
     public:
       itkTypeMacro( fpa::Filters::Dijkstra, fpa::Filters::RandomWalker );
 
-      fpaFilterOutputMacro( MinimumSpanningTree, TMST );
+      ivqITKOutputMacro( MinimumSpanningTree, TMST );
 
     protected:
       Dijkstra( );

diff --git a/lib/fpa/Filters/Dijkstra.hxx b/lib/fpa/Filters/Dijkstra.hxx
index e065e74850a1f558229ce7d1f39fb8247b6d61fd..30c9e202e4e8f5656b5b51b76ada9711ea3b6c4e 100644 (file)
--- a/lib/fpa/Filters/Dijkstra.hxx
+++ b/lib/fpa/Filters/Dijkstra.hxx
@@ -10,7 +10,7 @@ template< class _TDataInterface, class _TMST >
 fpa::Filters::Dijkstra< _TDataInterface, _TMST >::
 Dijkstra( )
 {
-  fpaFilterOutputConfigureMacro( MinimumSpanningTree, TMST );
+  ivqITKOutputConfigureMacro( MinimumSpanningTree, TMST );
 }
 
 // -------------------------------------------------------------------------

diff --git a/lib/fpa/Filters/Image/Dijkstra.h b/lib/fpa/Filters/Image/Dijkstra.h
index c4d34976aec98788b41ef19a49825ffd00087483..5f9bd5cd5aee10faa7eba5d0e7e749dfcde97435 100644 (file)
--- a/lib/fpa/Filters/Image/Dijkstra.h
+++ b/lib/fpa/Filters/Image/Dijkstra.h
@@ -8,7 +8,7 @@
 #include <fpa/Filters/Dijkstra.h>
 #include <fpa/Filters/Image/DefaultTraits.h>
 #include <fpa/Filters/Image/Interface.h>
-#include <fpa/DataStructures/Image/MinimumSpanningTree.h>
+#include <ivq/ITK/ImageMinimumSpanningTree.h>
 
 namespace fpa
 {
@@ -20,11 +20,11 @@ namespace fpa
        */
       template< class _TInputImage, class _TOutputImage, class _TMark = unsigned char, class _TTraits = fpa::Filters::Image::DefaultTraits< _TInputImage, _TOutputImage, _TMark > >
       class Dijkstra
-        : public fpa::Filters::Dijkstra< fpa::Filters::Image::Interface< _TTraits >, fpa::DataStructures::Image::MinimumSpanningTree< _TTraits::Dimension > >
+        : public fpa::Filters::Dijkstra< fpa::Filters::Image::Interface< _TTraits >, ivq::ITK::ImageMinimumSpanningTree< _TTraits::Dimension > >
       {
       public:
         typedef _TTraits TTraits;
-        typedef fpa::DataStructures::Image::MinimumSpanningTree< _TTraits::Dimension > TMST;
+        typedef ivq::ITK::ImageMinimumSpanningTree< _TTraits::Dimension > TMST;
 
         typedef fpa::Filters::Image::Interface< TTraits >  TInterface;
         typedef fpa::Filters::Dijkstra< TInterface, TMST > Superclass;

diff --git a/lib/fpa/Filters/Image/ExtractAxis.h b/lib/fpa/Filters/Image/ExtractAxis.h
index cced4a30ef5c75e9f207c690f2cf4c13de3dc8a5..c6c3a4b24f0c9fdd37f6e89acdae18ab5bf0fad2 100644 (file)
--- a/lib/fpa/Filters/Image/ExtractAxis.h
+++ b/lib/fpa/Filters/Image/ExtractAxis.h
@@ -7,7 +7,7 @@
 
 #include <itkProcessObject.h>
 #include <itkImageToImageFilter.h>
-#include <fpa/DataStructures/Image/Path.h>
+#include <ivq/ITK/ImagePath.h>
 #include <fpa/Filters/Image/Dijkstra.h>
 
 namespace fpa
@@ -42,7 +42,7 @@ namespace fpa
         typedef itk::Image< TScalar, Self::Dimension > TScalarImage;
         typedef itk::ImageToImageFilter< TInputImage, TScalarImage > TCenterness;
 
-        typedef fpa::DataStructures::Image::Path< Self::Dimension > TPath;
+        typedef ivq::ITK::ImagePath< Self::Dimension > TPath;
         typedef fpa::Filters::Image::Dijkstra< TScalarImage, TScalarImage > TDijkstra;
 
       public:

diff --git a/lib/fpa/Filters/Image/ExtractSkeleton.h b/lib/fpa/Filters/Image/ExtractSkeleton.h
index 5f4e9b8af9047ec2d191e0cab9043edf77877b69..9e7f948f0e736aa9fdba01b4fbe9346986f87959 100644 (file)
--- a/lib/fpa/Filters/Image/ExtractSkeleton.h
+++ b/lib/fpa/Filters/Image/ExtractSkeleton.h
@@ -9,7 +9,7 @@
 #include <itkProcessObject.h>
 #include <itkSignedMaurerDistanceMapImageFilter.h>
 #include <fpa/Filters/Image/Dijkstra.h>
-#include <fpa/DataStructures/Image/Skeleton.h>
+#include <ivq/ITK/ImageSkeleton.h>
 
 namespace fpa
 {
@@ -41,7 +41,7 @@ namespace fpa
         typedef typename TInputImage::IndexType        TIndex;
         typedef typename TOutputImage::PixelType       TScalar;
 
-        typedef fpa::DataStructures::Image::Skeleton< Self::Dimension > TSkeleton;
+        typedef ivq::ITK::ImageSkeleton< Self::Dimension > TSkeleton;
 
       protected:
         typedef std::multimap< TScalar, TIndex > _TSkeletonQueue;

diff --git a/lib/fpa/Filters/Image/Interface.h b/lib/fpa/Filters/Image/Interface.h
index d0df734501d95b9f7111c372241544caf19c0a1a..1da7083db35e07f9ba6b7d80c84aad6e48132a87 100644 (file)
--- a/lib/fpa/Filters/Image/Interface.h
+++ b/lib/fpa/Filters/Image/Interface.h
@@ -32,7 +32,7 @@ namespace fpa
         typedef itk::SmartPointer< const Self >     ConstPointer;
 
       public:
-        fpaFilterOutputMacro( Marks, TMarksImage );
+        ivqITKOutputMacro( Marks, TMarksImage );
 
         itkGetConstMacro( NeighborhoodOrder, unsigned int );
         itkSetMacro( NeighborhoodOrder, unsigned int );

diff --git a/lib/fpa/Filters/Image/Interface.hxx b/lib/fpa/Filters/Image/Interface.hxx
index aaafad2be177a35bb51ef43db7e16644d4f8c2ef..f07913dbbb46020db06cb716d6990d0adcda9643 100644 (file)
--- a/lib/fpa/Filters/Image/Interface.hxx
+++ b/lib/fpa/Filters/Image/Interface.hxx
@@ -12,7 +12,7 @@ Interface( )
   : Superclass( ),
     m_NeighborhoodOrder( 1 )
 {
-  fpaFilterOutputConfigureMacro( Marks, TMarksImage );
+  ivqITKOutputConfigureMacro( Marks, TMarksImage );
 }
 
 // -------------------------------------------------------------------------

diff --git a/lib/fpa/Filters/Image/RandomWalker.h b/lib/fpa/Filters/Image/RandomWalker.h
index 198112f7172cf54987dfd29174318ef702771ec4..cffd914a09ff768492ef869d6058cada5341d5a6 100644 (file)
--- a/lib/fpa/Filters/Image/RandomWalker.h
+++ b/lib/fpa/Filters/Image/RandomWalker.h
@@ -39,7 +39,7 @@ namespace fpa
       public:
         itkNewMacro( Self );
 
-        fpaFilterInputMacro( InputLabels, _TLabelImage );
+        ivqITKInputMacro( InputLabels, _TLabelImage );
 
       public:
         TInputImage* GetInputImage( );

diff --git a/lib/fpa/Filters/Image/RandomWalker.hxx b/lib/fpa/Filters/Image/RandomWalker.hxx
index 664e7d7e83710f8f9b2790ca520783b3a94438a4..29d3e350db5459599c6b66d1ad60f1aa531ebf9f 100644 (file)
--- a/lib/fpa/Filters/Image/RandomWalker.hxx
+++ b/lib/fpa/Filters/Image/RandomWalker.hxx
@@ -86,7 +86,7 @@ fpa::Filters::Image::RandomWalker< _TInputImage, _TLabelImage, _TCost, _TTraits
 RandomWalker( )
   : Superclass( )
 {
-  fpaFilterInputConfigureMacro( InputLabels, _TLabelImage );
+  ivqITKInputConfigureMacro( InputLabels, _TLabelImage );
 }
 
 // -------------------------------------------------------------------------