X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=2dd6a03951257d9c09521c370c09d78c19cd20ca;hb=dfc6fa4fa336044fef3db25a80ca4fb1d2ec84a4;hp=04b523d52e68a271a5923881ceb74a254b6aa015;hpb=c0e5c17c45ecb106079122fcf1c7005b173092e5;p=bbtk.git diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 04b523d..2dd6a03 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $ Language: C++ - Date: $Date: 2008/03/03 11:49:17 $ - Version: $Revision: 1.1 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2011/06/16 12:28:57 $ + Version: $Revision: 1.11 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* or in the file LICENSE.txt. +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited +* liability. +* +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL-B license and that you accept its terms. +* ------------------------------------------------------------------------ */ + /** * \file * \brief @@ -24,53 +37,79 @@ #include "bbitkvtkitkImage2vtkImageData.h" #include "bbitkvtkPackage.h" -// VtkToItkConnection -//#include "itkVTKImageToImageFilter.h" -// ItkToVtkConnection #include "itkImageToVTKImageFilter.h" namespace bbitkvtk { - BBTK_USER_BLACK_BOX_IMPLEMENTATION(itkImage2vtkImageData,bbtk::AtomicBlackBox); + BBTK_BLACK_BOX_IMPLEMENTATION(itkImage2vtkImageData,bbtk::AtomicBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,itkImage2vtkImageData); - - - void itkImage2vtkImageData::Convert() { bbtk::TypeInfo t = bbGetInputIn().type(); BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert); } - - template void itkImage2vtkImageData::Convert() - { - bbtkDebugMessageInc("Core",9,"itkImage2vtkImageData<" - <() - <<">::Convert()"< ["<() + <<">()"< VtkToItkConnection; + typedef itkImageType* itkImageTypePointer; 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(); - conv->SetInput( this->bbGetInputIn().get() ); - conv->Update(); - vtkImageData* o = vtkImageData::New(); - // o->SetReferenceCount(10); - o->DeepCopy(conv->GetOutput()); + bbtkDebugMessage("process",5," ["<SetInput( this->bbGetInputIn().get< itkImageTypePointer >() ); + } + 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,12 +117,24 @@ namespace bbitkvtk <() <<">::Convert() : "<() + <<">() *DONE*"<