X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=852e4d9759bfbc4ac2dcb8461980ee77f4315ce4;hb=cf6eb7c340117809171dc171cbd7a2ba88e91be4;hp=3fe9fe370701bd9d566cc48fdd68fb62d9854f5c;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 3fe9fe3..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/04/18 12:59:50 $ - Version: $Revision: 1.2 $ + 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,27 +50,61 @@ namespace bbitkvtk template void itkImage2vtkImageData::Convert() { - bbtkDebugMessageInc("Core",9,"itkImage2vtkImageData<" - <() - <<">::Convert()"< ["<() + <<">()"< 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," ["<SetInput( this->bbGetInputIn().get() ); - conv->Update(); - vtkImageData* o = vtkImageData::New(); - // o->SetReferenceCount(10); - o->DeepCopy(conv->GetOutput()); + } + else + { + bbtkDebugMessage("process",5," ["< + ((itk::ProcessObject*)mConverter); + if (!conv) + { + bbtkDebugMessage("process",5," ["<UnRegister(); + conv = ItkToVtkConnection::New(); + mConverter = conv; + conv->SetInput( this->bbGetInputIn().get() ); + } + // Input image type did not change but input image pointer did: + // set new input + else if ( this->bbGetInputIn().get() + != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer())) + { + bbtkDebugMessage("process",5," ["<SetInput( this->bbGetInputIn().get() ); + } + else + { + bbtkDebugMessage("process",5," ["<Print(std::cout); - if (bbGetOutputOut()) bbGetOutputOut()->Delete(); - bbSetOutputOut(o); + conv->Update(); + bbSetOutputOut(conv->GetOutput()); } catch( itk::ExceptionObject & e) { @@ -78,13 +112,27 @@ namespace bbitkvtk <() <<">::Convert() : "<() + <<">() *DONE*"<