]> Creatis software - bbtk.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Tue, 3 May 2011 12:24:22 +0000 (12:24 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Tue, 3 May 2011 12:24:22 +0000 (12:24 +0000)
packages/itk/src/bbitkResampleImageFilter.h
packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx

index 03fbd59a6d292980f7a6480f2af20e94e30b227d..7380db2b322626e60d3ef3e036b098897de75041 100644 (file)
@@ -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<double>);
-    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<double>);
+       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<T,D>*",anyImagePointer,"");
-  BBTK_INPUT(ResampleImageFilter,Spacing,
-            "Spacing",std::vector<double>,"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<T,D>*",anyImagePointer,"");
+  BBTK_INPUT(ResampleImageFilter,Spacing,"Spacing",std::vector<double>,"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_
index 07e04327da859531c557402ebedd1394ac247990..50bf4f64b57d67beaf0dc5815e75bd1faaa5fc77 100644 (file)
@@ -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<double> 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<size;i++)
                {
@@ -85,9 +78,7 @@ std::cout <<
        //-----------------------------------------------------------   
        void VecIsoSurfaceExtractor::Process()
        {
-std::cout <<
-"================================VecIsoSurfaceExtractor::Process()"
-<< std::endl;
+//EED std::cout <<"================================VecIsoSurfaceExtractor::Process()" << std::endl;
                double r,g,b;
                vtkMarchingCubes  *marchingcubes;
                vtkPolyDataMapper *polydatamapper;