X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkvtkImageData2itkImage.cxx;h=a378afea06d396cfb407e3c5ad69e4fb226d4f80;hb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;hp=92d5fed9953938bdff5437e7540ce30a426e47bc;hpb=c0e5c17c45ecb106079122fcf1c7005b173092e5;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
index 92d5fed..a378afe 100644
--- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
+++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkvtkImageData2itkImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 11:49:17 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/25 11:17:18 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@
 namespace bbitkvtk 
 {
   
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(vtkImageData2itkImage,bbtk::AtomicBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(vtkImageData2itkImage,bbtk::AtomicBlackBox);
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,vtkImageData2itkImage);
   
@@ -67,27 +67,57 @@ namespace bbitkvtk
    template<class T, unsigned int D>
    void vtkImageData2itkImage::Convert()
   {
-    bbtkDebugMessageInc("Core",9,"vtkImageData2itkImage<"
+    bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
 			<<bbtk::TypeName<T>()<<","<<D
-			<<">::Convert()"<<std::endl);
+			<<">()"<<std::endl);
+    
 
     typedef itk::Image<T,D> itkImageType;
     typedef itk::VTKImageToImageFilter< itkImageType > VtkToItkConnection;
-    //typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
+    typename VtkToItkConnection::Pointer conv;
 
-
-    try 
+    // No converter yet : create it and set its input
+    if (!mConverter) 
       {
-	typename VtkToItkConnection::Pointer conv = VtkToItkConnection::New();
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
+	conv = VtkToItkConnection::New();
+	mConverter = conv;
 	conv->SetInput( this->bbGetInputIn() );
-	conv->Update();
-
-	// How to unreference the old output (is in an any...) ?
-	//if (bbGetOutputOut()) bbGetOutputOut()->Unreference();
+      }
+    else 
+      {
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter ok "<<std::endl);
+	// Input vtkImage type changed ? 
+	// Have to change the converter and set its input
+	conv = dynamic_cast<VtkToItkConnection*>
+	  ((itk::ProcessObject*)mConverter);
+	if (!conv) 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter of wrong input type : reacreating it "<<std::endl);
+	    mConverter->UnRegister();
+	    conv = VtkToItkConnection::New();
+	    mConverter = conv;
+	    conv->SetInput( this->bbGetInputIn() );
+	  }
+	// Input image type did not change but input image pointer did:
+	// set new input
+	else if ( this->bbGetInputIn() != conv->GetExporter()->GetInput())
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
+	    conv->SetInput( this->bbGetInputIn() );
+	  }
+	else 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);	  
+	  }
+      }
+    try
+      {
 	
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Trying update"<<std::endl);	 
+	conv->Update();
 	itkImageType* out = const_cast<itkImageType*>(conv->GetOutput());
-	out->Register();	
-	bbSetOutputOut(out);
+	bbSetOutputOut(out);	
       }
     catch( itk::ExceptionObject & e) 
       {
@@ -95,12 +125,29 @@ namespace bbitkvtk
 		  <<bbtk::TypeName<T>()<<","<<D
 		  <<">::Convert() : "<<e);
       } 
-
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
+		     <<bbtk::TypeName<T>()<<","<<D
+		     <<">() *DONE*"<<std::endl);	 
   }
 
   
-
+  void vtkImageData2itkImage::bbUserConstructor()
+  {
+    //    bbSetOutputOut(NULL);
+    mConverter = 0;
+  }
+  
+  void vtkImageData2itkImage::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
+  {
+    //    bbSetOutputOut(NULL);
+    mConverter = 0;
+  }
+  
+  void vtkImageData2itkImage::bbUserDestructor()
+  {
+    //    if (mConverter) mConverter->UnRegister();
+  }
+