X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=8347241b41dfad329e3bc9c5728a1a00b9f4356c;hb=296a644550aec58bcab0a7c55e486da19eef78f1;hp=653664176a0ff3d82a34826798ec20c1a9d4fb8d;hpb=64953af6e7389a36c4fb533b58bf720ba1342cd7;p=bbtk.git diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 6536641..8347241 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx @@ -1,32 +1,38 @@ -/*========================================================================= +/* +# --------------------------------------------------------------------- +# +# 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: 2009/05/14 16:21:15 $ - Version: $Revision: 1.8 $ + Date: $Date: 2012/11/16 08:50:49 $ + Version: $Revision: 1.12 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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 @@ -37,28 +43,86 @@ #include "bbitkvtkitkImage2vtkImageData.h" #include "bbitkvtkPackage.h" -// VtkToItkConnection -//#include "itkVTKImageToImageFilter.h" -// ItkToVtkConnection #include "itkImageToVTKImageFilter.h" + +/* +#EED 2017-08-29 itk3toitk4 +#define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di ) \ + if( t == typeid( itk::Image< ty, di > ) ) \ + this->Convert< itk::Image< ty, di > >( ) +*/ + + + + +// ------------------------------------------------------------------------- +// LFV: avoid itk::Concept check on 4d or superior images +//EED 2021-12-15 typeid comparation is not working in MacOs for objects declared in different libraries +// ex: itk <-> vtk templates convertion +#if defined(MACOSX) + #define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di ) \ + if ( strcmp(t.name() , typeid( itk::Image< ty, di >* ).name() ) == 0 ) \ + this->Convert< itk::Image< ty, di > >( ) +#else + #define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di ) \ + if( t == typeid( itk::Image< ty, di >* ) ) \ + this->Convert< itk::Image< ty, di > >( ) +#endif +// ------------------------------------------------------------------------- + + + namespace bbitkvtk { 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); - } - + // Only supports images in 1, 2 or 3 dimensions + BBITKVTK_itkImage2vtkImageData_Template( t, char, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, short, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, int, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, long, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, float, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, double, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 1 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, char, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, short, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, int, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, long, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, float, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, double, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 2 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, char, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, short, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, int, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, long, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, float, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, double, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 3 ); + else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 3 ); + else { + printf("Warnning! EED itkImage2vtkImageData::Convert Type not found for: <%s>\n", bbtk::demangle_type_name(t.name()).c_str() ); + } + + /* Deprecated + BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert); + */ + } template void itkImage2vtkImageData::Convert() @@ -68,7 +132,7 @@ namespace bbitkvtk <<">()"< ItkToVtkConnection; typename ItkToVtkConnection::Pointer conv; @@ -79,15 +143,13 @@ namespace bbitkvtk conv = ItkToVtkConnection::New(); mConverter = conv; conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() ); - } - else - { + } else { bbtkDebugMessage("process",5," ["< - ((itk::ProcessObject*)mConverter); + ((itk::ProcessObject*)mConverter); if (!conv) { bbtkDebugMessage("process",5," ["<SetInput( this->bbGetInputIn().get() ); } - else - { - bbtkDebugMessage("process",5," ["<() <<">() *DONE*"<