X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=0a68db1f1c3aa071b7c337f1a43b7bc35e3b5051;hb=e85546c7218522af75cec623b9419781c7c4208f;hp=9d6308dfe6afa87c380b252d14a68c46fc90ec36;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 9d6308d..0a68db1 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:24 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2010/02/08 15:15:25 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -49,25 +49,21 @@ namespace bbitkvtk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,itkImage2vtkImageData);
 
-
-
-
   void itkImage2vtkImageData::Convert()
   {
     bbtk::TypeInfo t = bbGetInputIn().type();
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert);
   }
-  
-
 
    template<class T>
    void itkImage2vtkImageData::Convert()
-  {
+   {
     bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()
 		     <<">()"<<std::endl);
 
     typedef T itkImageType;
+	typedef itkImageType* itkImageTypePointer;
     typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
     typename ItkToVtkConnection::Pointer conv;
 
@@ -77,7 +73,7 @@ namespace bbitkvtk
 	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
 	conv = ItkToVtkConnection::New();
 	mConverter = conv;
-	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() );
       }
     else 
       {
@@ -94,21 +90,20 @@ namespace bbitkvtk
 	    mConverter->UnRegister();
 	    conv = ItkToVtkConnection::New();
 	    mConverter = conv;
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	// Input image type did not change but input image pointer did:
 	// set new input
-	else if ( this->bbGetInputIn().get<itkImageType*>() 
+	else if ( this->bbGetInputIn().get<itkImageTypePointer>() 
 		  != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
 	  {
 	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
 
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	else 
 	  {
-	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);	  
-
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);
 	  }
       }
     try
@@ -128,25 +123,23 @@ namespace bbitkvtk
     bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()
 		     <<">() *DONE*"<<std::endl);
-
-
  }
 
-  void itkImage2vtkImageData::bbUserConstructor()
+  void itkImage2vtkImageData::bbUserSetDefaultValues()
   {
     bbSetOutputOut(NULL);
     mConverter = 0;
   }
-  void itkImage2vtkImageData::bbUserCopyConstructor()
-  {
-    bbSetOutputOut(NULL);
-    mConverter = 0;
-  }
-  void itkImage2vtkImageData::bbUserDestructor()
-  {
-  }
-  
 
+  void itkImage2vtkImageData::bbUserInitializeProcessing()
+	{
+	}
+	
+  void itkImage2vtkImageData::bbUserFinalizeProcessing()	
+	{
+	}
+
+	
 }
 // eo namespace bbitkvtk