From cc1685b591796baaed0e3c9327cb83a218347b27 Mon Sep 17 00:00:00 2001 From: dsarrut Date: Tue, 2 Mar 2010 12:20:50 +0000 Subject: [PATCH] - essai pour compiler plus vite --- common/CMakeLists.txt | 4 +- common/clitkImageToImageGenericFilter.h | 103 +----------------- common/vvFromITK.h | 8 +- .../clitkGuerreroVentilationGenericFilter.cxx | 2 - .../clitkGuerreroVentilationGenericFilter.h | 2 - filters/clitkImageResampleGenericFilter.cxx | 14 +++ filters/clitkImageResampleGenericFilter.h | 18 +-- 7 files changed, 26 insertions(+), 125 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 38eb7e1..e2a6795 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -6,7 +6,7 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake) #========================================================= #========================================================= -# make clitk libraries +# make clitk libraries* SET(clitkCommon_SRC clitkCommon.cxx @@ -25,7 +25,7 @@ SET(clitkCommon_SRC clitkXdrImageIOFactory.cxx clitkOrientation.cxx vvImage.cxx - clitkImageToImageGenericFilter.cxx + clitkImageToImageGenericFilterBase.cxx clitkSignal.cxx ) diff --git a/common/clitkImageToImageGenericFilter.h b/common/clitkImageToImageGenericFilter.h index eb244b8..a27ce67 100644 --- a/common/clitkImageToImageGenericFilter.h +++ b/common/clitkImageToImageGenericFilter.h @@ -3,8 +3,8 @@ Program: clitk Module: $RCSfile: clitkImageToImageGenericFilter.h,v $ Language: C++ - Date: $Date: 2010/02/09 14:40:55 $ - Version: $Revision: 1.7 $ + Date: $Date: 2010/03/02 12:20:50 $ + Version: $Revision: 1.8 $ Author : Joel Schaerer David Sarrut @@ -30,98 +30,11 @@ #define CLITKIMAGETOIMAGEGENERICFILTER_H // clitk include -#include "clitkCommon.h" -#include "clitkImageCommon.h" -#include "clitkCommonGenericFilter.h" -#include - -// vv include -#include -#include -#include -#include -#include +#include "clitkImageToImageGenericFilterBase.h" namespace clitk { - //-------------------------------------------------------------------- - class ImageToImageGenericFilterBase: public itk::Object { - - public: - // constructor - destructor - ImageToImageGenericFilterBase(std::string filterName); - virtual ~ImageToImageGenericFilterBase() {} - - // Types - typedef ImageToImageGenericFilterBase Self; - typedef Object Superclass; - typedef itk::SmartPointer Pointer; - typedef itk::SmartPointer ConstPointer; - - // Filters information - const std::string & GetFilterName() { return mFilterName; } - void SetFilterName(std::string & n) { mFilterName = n; } - - // Generic IO - /// Returns the dimension and pixel type of the *first* input - void GetInputImageDimensionAndPixelType(unsigned int& dim, std::string& pixeltype,unsigned int & components); - - // File IO - void SetInputFilename(const std::string & filename); - void AddInputFilename(const std::string & filename); - void SetInputFilenames(const std::vector & filenames); - void SetOutputFilename(const std::string & filename); - void AddOutputFilename(const std::string & filename); - void SetOutputFilenames(const std::vector & filenames); - std::string GetOutputFilename(); - void SetIOVerbose(bool b) { mIOVerbose = b; } - - // VVImage IO - void SetInputVVImage (vvImage::Pointer input); - void SetInputVVImages (std::vector input); - void AddInputVVImage (vvImage::Pointer input); - vvImage::Pointer GetOutputVVImage (); - std::vector GetOutputVVImages (); - - // Information on available image types - void PrintAvailableImageTypes(); - virtual std::string GetAvailableImageTypes() = 0; - - virtual bool CheckImageType(unsigned int dim,unsigned int ncomp, std::string pixeltype) = 0; - virtual bool CheckImageType() = 0; - - // Main function to call for using the filter. - virtual bool Update() = 0; - - protected: - /// Call this function to dispatch an output towards the correct sink - template - void SetNextOutput(typename ImageType::Pointer output); - - /// Call this function to get the nth itk input image, regardless of input source - template - typename ImageType::Pointer GetInput(unsigned int n); - - std::vector mInputFilenames; - std::list mOutputFilenames; - - bool mIOVerbose; - unsigned int mDim; - std::string mPixelTypeName; - unsigned int mNbOfComponents; - std::string mFilterName; - - std::vector mInputVVImages; - std::vector mOutputVVImages; - - void ImageTypeError(); - void SetImageTypeError(); - bool mFailOnImageTypeError; - - }; // end class clitk::ImageToImageGenericFilter - - - //-------------------------------------------------------------------- +//-------------------------------------------------------------------- template class ImageToImageGenericFilter: public ImageToImageGenericFilterBase { @@ -145,13 +58,7 @@ namespace clitk { }; // end class clitk::ImageToImageGenericFilter - // #define ADD_IMAGE_DIMENSION(DIM) Initialize(); - -#define ADD_VEC_IMAGE_TYPE(DIM, COMP, PT) this->mImageTypesManager.template AddNewDimensionAndPixelType(); -#define ADD_IMAGE_TYPE(DIM, PT) this->mImageTypesManager.template AddNewDimensionAndPixelType(); - - -#include "clitkImageToImageGenericFilter.txx" +#include "clitkImageToImageGenericFilter.txx" } // end namespace diff --git a/common/vvFromITK.h b/common/vvFromITK.h index 4d43c61..9e1f7c1 100644 --- a/common/vvFromITK.h +++ b/common/vvFromITK.h @@ -22,13 +22,13 @@ along with this program. If not, see . =========================================================================*/ -#ifndef vvImageFromITK_h -#define vvImageFromITK_h +#ifndef VVIMAGEFROMITK_H +#define VVIMAGEFROMITK_H #include "vvImage.h" -#include +//#include #include -#include "itkImageToVTKImageFilter.h" +#include /**Converts the itk image to vv, handling the 4D problem * The time_sequence boolean specifies that the image is to be interpreted as a time sequence, diff --git a/filters/clitkGuerreroVentilationGenericFilter.cxx b/filters/clitkGuerreroVentilationGenericFilter.cxx index 1a2dcd6..5df7bea 100644 --- a/filters/clitkGuerreroVentilationGenericFilter.cxx +++ b/filters/clitkGuerreroVentilationGenericFilter.cxx @@ -19,8 +19,6 @@ * @brief -------------------------------------------------------------------*/ -#include -#include #include "clitkGuerreroVentilationGenericFilter.h" #include #include diff --git a/filters/clitkGuerreroVentilationGenericFilter.h b/filters/clitkGuerreroVentilationGenericFilter.h index 5d1062a..6b9ec7c 100644 --- a/filters/clitkGuerreroVentilationGenericFilter.h +++ b/filters/clitkGuerreroVentilationGenericFilter.h @@ -21,8 +21,6 @@ -------------------------------------------------------------------*/ // clitk include -#include "clitkCommon.h" -#include "clitkImageCommon.h" #include "clitkImageToImageGenericFilter.h" // itk include diff --git a/filters/clitkImageResampleGenericFilter.cxx b/filters/clitkImageResampleGenericFilter.cxx index da510c6..7302cbe 100644 --- a/filters/clitkImageResampleGenericFilter.cxx +++ b/filters/clitkImageResampleGenericFilter.cxx @@ -13,6 +13,20 @@ #include "clitkImageResampleGenericFilter.h" +// itk include +#include "itkImage.h" +#include "itkImageFileReader.h" +#include "itkImageSeriesReader.h" +#include "itkImageFileWriter.h" +#include "itkRecursiveGaussianImageFilter.h" +#include "itkResampleImageFilter.h" +#include "itkAffineTransform.h" +#include "itkNearestNeighborInterpolateImageFunction.h" +#include "itkLinearInterpolateImageFunction.h" +#include "itkBSplineInterpolateImageFunction.h" +#include "itkBSplineInterpolateImageFunctionWithLUT.h" +#include "itkCommand.h" + //-------------------------------------------------------------------- clitk::ImageResampleGenericFilter::ImageResampleGenericFilter(): ImageToImageGenericFilter("ImageResample") { diff --git a/filters/clitkImageResampleGenericFilter.h b/filters/clitkImageResampleGenericFilter.h index 5bd8972..f9ad50a 100644 --- a/filters/clitkImageResampleGenericFilter.h +++ b/filters/clitkImageResampleGenericFilter.h @@ -11,24 +11,8 @@ -------------------------------------------------------------------*/ // clitk include -#include "clitkCommon.h" -#include "clitkImageCommon.h" #include "clitkImageToImageGenericFilter.h" -// itk include -#include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageSeriesReader.h" -#include "itkImageFileWriter.h" -#include "itkRecursiveGaussianImageFilter.h" -#include "itkResampleImageFilter.h" -#include "itkAffineTransform.h" -#include "itkNearestNeighborInterpolateImageFunction.h" -#include "itkLinearInterpolateImageFunction.h" -#include "itkBSplineInterpolateImageFunction.h" -#include "itkBSplineInterpolateImageFunctionWithLUT.h" -#include "itkCommand.h" - namespace clitk { //-------------------------------------------------------------------- @@ -76,7 +60,7 @@ namespace clitk { }; // end class ImageResampleGenericFilter //-------------------------------------------------------------------- -#include "clitkImageResampleGenericFilter.txx" + //#include "clitkImageResampleGenericFilter.txx" } // end namespace //-------------------------------------------------------------------- -- 2.45.1