From 08496817108d65c35b386ba63942edb5f9f6cb61 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Tue, 3 May 2011 12:24:22 +0000 Subject: [PATCH] no message --- packages/itk/src/bbitkResampleImageFilter.h | 33 ++++++++----------- .../vtk/src/bbvtkVecIsoSurfaceExtractor.cxx | 17 +++------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h index 03fbd59..7380db2 100644 --- a/packages/itk/src/bbitkResampleImageFilter.h +++ b/packages/itk/src/bbitkResampleImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkResampleImageFilter.h,v $ Language: C++ - Date: $Date: 2009/05/18 10:45:44 $ - Version: $Revision: 1.10 $ + Date: $Date: 2011/05/03 12:24:22 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -48,12 +48,11 @@ namespace bbitk : public bbtk::AtomicBlackBox { - BBTK_BLACK_BOX_INTERFACE(ResampleImageFilter, - bbtk::AtomicBlackBox); - BBTK_DECLARE_INPUT(In,anyImagePointer); - BBTK_DECLARE_INPUT(Spacing,std::vector); - BBTK_DECLARE_INPUT(Interpolation,std::string); - BBTK_DECLARE_OUTPUT(Out,anyImagePointer); + BBTK_BLACK_BOX_INTERFACE(ResampleImageFilter, bbtk::AtomicBlackBox); + BBTK_DECLARE_INPUT(In,anyImagePointer); + BBTK_DECLARE_INPUT(Spacing,std::vector); + BBTK_DECLARE_INPUT(Interpolation,std::string); + BBTK_DECLARE_OUTPUT(Out,anyImagePointer); BBTK_PROCESS(ProcessSwitch); private : inline void ProcessSwitch(); @@ -69,15 +68,10 @@ namespace bbitk BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Resamples an image"); BBTK_CATEGORY("image;filter"); - BBTK_INPUT(ResampleImageFilter,In, - "Input image. Can be any itk::Image*",anyImagePointer,""); - BBTK_INPUT(ResampleImageFilter,Spacing, - "Spacing",std::vector,"spacing"); - BBTK_INPUT(ResampleImageFilter,Interpolation, - "Interpolation",std::string,""); - BBTK_OUTPUT(ResampleImageFilter,Out, - "Output image. Of the same type and dimension than the input image", - anyImagePointer,""); + BBTK_INPUT(ResampleImageFilter,In,"Input image. Can be any itk::Image*",anyImagePointer,""); + BBTK_INPUT(ResampleImageFilter,Spacing,"Spacing",std::vector,"spacing"); + BBTK_INPUT(ResampleImageFilter,Interpolation,"Interpolation: Linear (default) || BSpline || NearestNeighbor) ",std::string,""); + BBTK_OUTPUT(ResampleImageFilter,Out,"Output image. Of the same type and dimension than the input image",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ResampleImageFilter); //=================================================== @@ -203,7 +197,6 @@ namespace bbitk } -} -// EO namespace bbtk +} // EO namespace bbitk -#endif +#endif // _USE_ITK_ diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx index 07e0432..50bf4f6 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx @@ -13,10 +13,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); //----------------------------------------------------------- void VecIsoSurfaceExtractor::bbUserSetDefaultValues() { - -std::cout << -"================================VecIsoSurfaceExtractor::bbUserSetDefaultValues()" -<< std::endl; +//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserSetDefaultValues()" << std::endl; std::vector colour; // 1- red colour.push_back(1.0); @@ -59,17 +56,13 @@ std::cout << { // bbSetInputIn(NULL); // bbSetInputInVtkObject(NULL); -std::cout << -"================================VecIsoSurfaceExtractor::bbUserInitializeProcessing()" -<< std::endl; +//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserInitializeProcessing()" << std::endl; } //----------------------------------------------------------- void VecIsoSurfaceExtractor::bbUserFinalizeProcessing() { -std::cout << -"================================VecIsoSurfaceExtractor::bbUserFinalizeProcessing()" -<< std::endl; +//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserFinalizeProcessing()" << std::endl; int i,size = VecMarchingcubes.size(); for (i=0;i