From 357915c0f41acc6cc5ea45978302b7bf95068dcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leonardo=20Fl=C3=B3rez-Valencia?= Date: Tue, 10 Oct 2017 08:41:54 -0500 Subject: [PATCH] ... --- appli/CTArteries/CTArteries.cxx | 2 +- appli/CTArteries/CTArteries.h | 4 ++-- appli/CTArteries/algorithms/RandomWalkLabelling.h | 8 ++++---- appli/CTArteries/algorithms/RandomWalkLabelling.hxx | 4 ++-- appli/CTArteries/algorithms/RandomWalkSegmentation.h | 6 +++--- appli/CTArteries/algorithms/RandomWalkSegmentation.hxx | 2 +- appli/CTBronchi/MoriLabelling.cxx | 8 ++++---- examples/image/Dijkstra/ExtractAxis.cxx | 4 ++-- examples/image/Dijkstra/ExtractSkeleton.cxx | 4 ++-- lib/fpa/Common/RandomWalker.h | 4 ++-- lib/fpa/Common/RandomWalker.hxx | 4 ++-- lib/fpa/Filters/Dijkstra.h | 2 +- lib/fpa/Filters/Dijkstra.hxx | 2 +- lib/fpa/Filters/Image/Dijkstra.h | 6 +++--- lib/fpa/Filters/Image/ExtractAxis.h | 4 ++-- lib/fpa/Filters/Image/ExtractSkeleton.h | 4 ++-- lib/fpa/Filters/Image/Interface.h | 2 +- lib/fpa/Filters/Image/Interface.hxx | 2 +- lib/fpa/Filters/Image/RandomWalker.h | 2 +- lib/fpa/Filters/Image/RandomWalker.hxx | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/appli/CTArteries/CTArteries.cxx b/appli/CTArteries/CTArteries.cxx index 8b8a333..54b8aeb 100644 --- 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 b3e97c5..90d9e09 100644 --- a/appli/CTArteries/CTArteries.h +++ b/appli/CTArteries/CTArteries.h @@ -13,7 +13,7 @@ #include -#include +#include #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 1f3602a..3661cd4 100644 --- a/appli/CTArteries/algorithms/RandomWalkLabelling.h +++ b/appli/CTArteries/algorithms/RandomWalkLabelling.h @@ -4,7 +4,7 @@ #ifndef __RandomWalkLabelling__h__ #define __RandomWalkLabelling__h__ -#include +#include #include /** @@ -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 de662f1..28e7a47 100644 --- 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 b7199de..eaef1de 100644 --- a/appli/CTArteries/algorithms/RandomWalkSegmentation.h +++ b/appli/CTArteries/algorithms/RandomWalkSegmentation.h @@ -6,7 +6,7 @@ #include #include -#include +#include /** */ @@ -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 30738e9..994e98c 100644 --- 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 78544b5..848bf6d 100644 --- 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 6d94cae..3826de0 100644 --- a/examples/image/Dijkstra/ExtractAxis.cxx +++ b/examples/image/Dijkstra/ExtractAxis.cxx @@ -5,7 +5,7 @@ #include #include -#include +#include #include // ------------------------------------------------------------------------- @@ -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 9984de9..636b5fb 100644 --- a/examples/image/Dijkstra/ExtractSkeleton.cxx +++ b/examples/image/Dijkstra/ExtractSkeleton.cxx @@ -5,7 +5,7 @@ #include #include -#include +#include #include // ------------------------------------------------------------------------- @@ -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 6a4afa5..6a70340 100644 --- 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 a798735..39bfdd0 100644 --- 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 9356ed8..d9c5b17 100644 --- 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 e065e74..30c9e20 100644 --- 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 c4d3497..5f9bd5c 100644 --- a/lib/fpa/Filters/Image/Dijkstra.h +++ b/lib/fpa/Filters/Image/Dijkstra.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include 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 cced4a3..c6c3a4b 100644 --- a/lib/fpa/Filters/Image/ExtractAxis.h +++ b/lib/fpa/Filters/Image/ExtractAxis.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include 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 5f4e9b8..9e7f948 100644 --- a/lib/fpa/Filters/Image/ExtractSkeleton.h +++ b/lib/fpa/Filters/Image/ExtractSkeleton.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include 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 d0df734..1da7083 100644 --- 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 aaafad2..f07913d 100644 --- 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 198112f..cffd914 100644 --- 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 664e7d7..29d3e35 100644 --- 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 ); } // ------------------------------------------------------------------------- -- 2.45.1