X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=6e192c2b19a88252befa4731f6f6aa3fbab4bba4;hb=afce2a3d72f559d0d8c58f54bc9425f2aebf457f;hp=3fe9fe370701bd9d566cc48fdd68fb62d9854f5c;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 3fe9fe3..6e192c2 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx @@ -1,20 +1,39 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la SantÈ) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# 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. +# ------------------------------------------------------------------------ */ + + /*========================================================================= - Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:50 $ - Version: $Revision: 1.2 $ - - 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: 2012/11/16 08:50:49 $ + Version: $Revision: 1.12 $ =========================================================================*/ + + /** * \file * \brief @@ -24,9 +43,6 @@ #include "bbitkvtkitkImage2vtkImageData.h" #include "bbitkvtkPackage.h" -// VtkToItkConnection -//#include "itkVTKImageToImageFilter.h" -// ItkToVtkConnection #include "itkImageToVTKImageFilter.h" @@ -36,41 +52,70 @@ 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 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 +123,24 @@ namespace bbitkvtk <() <<">::Convert() : "<() + <<">() *DONE*"<