X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=852e4d9759bfbc4ac2dcb8461980ee77f4315ce4;hb=cf6eb7c340117809171dc171cbd7a2ba88e91be4;hp=0047b30bce1fb728c559141438289c86389f4307;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 0047b30..852e4d9 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/09 10:39:46 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/14 07:01:00 $
+  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
@@ -50,25 +50,61 @@ namespace bbitkvtk
    template<class T>
    void itkImage2vtkImageData::Convert()
   {
-    bbtkDebugMessageInc("Core",9,"itkImage2vtkImageData<"
-			<<bbtk::TypeName<T>()
-			<<">::Convert()"<<std::endl);
+    bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
+		     <<bbtk::TypeName<T>()
+		     <<">()"<<std::endl);
 
     typedef T itkImageType;
-    //   typedef itk::VTKImageToImageFilter< itkImageType > VtkToItkConnection;
     typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
+    typename ItkToVtkConnection::Pointer conv;
 
-
-    try 
+    // No converter yet : create it and set its input
+    if (!mConverter) 
       {
-	typename ItkToVtkConnection::Pointer conv = ItkToVtkConnection::New();
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
+	conv = ItkToVtkConnection::New();
+	mConverter = conv;
 	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+      }
+    else 
+      {
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter ok "<<std::endl);
+	
+	// Input itkImageType type changed ? 
+	// Have to change the converter and set its input
+	conv = dynamic_cast<ItkToVtkConnection*>
+	  ((itk::ProcessObject*)mConverter);
+	if (!conv) 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter of wrong input type : reacreating it "<<std::endl);
+
+	    mConverter->UnRegister();
+	    conv = ItkToVtkConnection::New();
+	    mConverter = conv;
+	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	  }
+	// Input image type did not change but input image pointer did:
+	// set new input
+	else if ( this->bbGetInputIn().get<itkImageType*>() 
+		  != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
+
+	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	  }
+	else 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);	  
+
+	  }
+      }
+    try
+      {
+	
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Trying update"<<std::endl);	 
+
 	conv->Update();
-	if (bbGetOutputOut()) bbGetOutputOut()->UnRegister(NULL);
 	bbSetOutputOut(conv->GetOutput());
-	//	bbGetOutputOut()->DebugOn();
-	bbGetOutputOut()->Register(NULL);
-	bbGetOutputOut()->SetSource(NULL);
       }
     catch( itk::ExceptionObject & e) 
       {
@@ -76,25 +112,27 @@ namespace bbitkvtk
 		  <<bbtk::TypeName<T>()
 		  <<">::Convert() : "<<e);
       } 
-    bbtkDebugDecTab("Core",9);
-  }
+    bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
+		     <<bbtk::TypeName<T>()
+		     <<">() *DONE*"<<std::endl);
+
+
+ }
 
   void itkImage2vtkImageData::bbUserConstructor()
   {
     bbSetOutputOut(NULL);
+    mConverter = 0;
   }
   void itkImage2vtkImageData::bbUserCopyConstructor()
   {
     bbSetOutputOut(NULL);
+    mConverter = 0;
   }
   void itkImage2vtkImageData::bbUserDestructor()
   {
-    if (bbGetOutputOut()) 
-      {
-	bbGetOutputOut()->UnRegister(NULL);
-      }
   }
-
+  
 
 }
 // eo namespace bbitkvtk