X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=e3a46313c24142846caca6d1ccea18810fabe9ae;hb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;hp=0047b30bce1fb728c559141438289c86389f4307;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 0047b30..e3a4631 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/05/09 10:39:46 $ - Version: $Revision: 1.3 $ - - 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: 2008/11/25 11:17:17 $ + Version: $Revision: 1.7 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 @@ -49,26 +62,63 @@ namespace bbitkvtk 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) + { + 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," ["<SetInput( this->bbGetInputIn().get() ); + + bbtkDebugMessage("process",5," ["<Update(); - if (bbGetOutputOut()) bbGetOutputOut()->UnRegister(NULL); bbSetOutputOut(conv->GetOutput()); - // bbGetOutputOut()->DebugOn(); - bbGetOutputOut()->Register(NULL); - bbGetOutputOut()->SetSource(NULL); } catch( itk::ExceptionObject & e) { @@ -76,25 +126,27 @@ namespace bbitkvtk <() <<">::Convert() : "<() + <<">() *DONE*"<UnRegister(NULL); - } } - + } // eo namespace bbitkvtk