By Leonardo Florez

Bonjour à tous,

Aujourd'hui je me suis plongé dans la compilation des creaTools avec ITK 4.3 et VTK 5.10. La chose marque plutôt pas mal, mais il m'a fallu introduire des changements dans le code. J'ai fait ces ajouts avec du code "différentiel" (en utilisant le preprocesseur de C++ pour détecter la version d'ITK et donc laisser le code utilisable depuis itk 3 ou itk 4). Je vous joins un "patch" avec les changements (je n'ai pas accès git pour faire un "commit" depuis ici...). Pour appliquer le patch, il faut aller au repertoire avec les sources de creatools (là où il y a un repertoire par projet), copier ici le patch ci-joint et executer la commande: "patch -p1 < patch_creatools". L'explication des changements est:

- Il faut compiler ITK 4 avec l'option "ITK_USE_CONCEPT_CHECKING" en "OFF". La cause c'est le système de "demangling" des pointeurs vers des objets "itk::Image" utilisé dans bbitk, qui est peu trop générique. J'ai une idée pour le faire marcher d'une façon plus propre, mais il me faudrait quelques jours de plus.
- bbtk, bbfy: j'ai rajouté un "tag" xml: verbosePreprocessor. Cela pour permettre au programmeur de jouer avec le preprocesseur (#if et cie.) de C++ et avoir du code "différentiel" (par exemple, pour utiliser des filtres itk 3 qui n'existent plus dans itk 4).
- bbtk, BBTKConfigurePackage_src.cmake: la variable d'environnement LD_LIBRARY_PATH était effacée au moment d'invoquer bbfy, donc bbfy ne marchait plus.
- bbtk, bbitkDICOMSeriesFileNames.xml: le nouveau "tag" xml est utilisé ici (itkDICOMSeriesFileNames n'existe plus dans itk 3, dans itk 4 s'appelle itkGDCMSeriesFileNames).
- crea: CDMUtilities.*: un template n'était pas bien utilisé (une instantiation explicite était nécessaire).
- crea: modelCDMProjectsTreeNode.h: une méthode manquait.
- creaBruker/testBruker2Dicom: les librairies de BOOST doivent être enchaînées en dernier... Magique!
- creaImageIO/TestWxGimmickReaderDialog/CMakeLists.txt: il y manquait l'enchaînement vers les librairies ITK.
- creaImageIO/src/creaImageIOWxAnySimpleDlg.cpp: des classes itk 3 qui n'existent plus dans itk 4.

Voilà! J'espère que ça peut vous être utile.

Amicalement,

Leo

diff --git a/appli/TestWxGimmickReaderDialog/CMakeLists.txt b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
index fa7307b94e80e513e14f72e70f18340511081bbb..255ab8f39eec323a0467825df1ef4574dc639bd0 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
@@ -30,6 +30,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(creaImageIOApp MACOSX_BUNDLE main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(         creaImageIOApp creaImageIO  )
+TARGET_LINK_LIBRARIES(         creaImageIOApp creaImageIO ${ITK_LIBRARIES} )
 
 INSTALL_TARGETS(/bin/ creaImageIOApp )

diff --git a/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx b/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx
index b3b8552023d5bb8675eeb0fff46694bfb0ab26a4..9c77a1de377b1cd7c416414c1b04e61aa985cd4b 100644 (file)
--- a/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx
+++ b/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx
@@ -1,28 +1,28 @@
 /*
-       # ---------------------------------------------------------------------
-       #
-       # 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.
-       # ------------------------------------------------------------------------
+  # ---------------------------------------------------------------------
+  #
+  # 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.
+  # ------------------------------------------------------------------------
 */
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -31,6 +31,16 @@
 #include "bbcreaImageIOItkImagesChooserDialogBox.h"
 #include "bbcreaImageIOPackage.h"
 
+// -------------------------------------------------------------------------
+// LFV: avoid itk::Concept check on 4d or superior images
+#define BBCREAIMAGEIO_ChooserDlg_Template( t, ty, di )            \
+  if( t == typeid( itk::Image< ty, di > ) )                       \
+  {                                                               \
+    this->Export< itk::Image< ty, di > >( );                      \
+    this->ExportVTK< itk::Image< ty, di > >( );                   \
+  }
+// -------------------------------------------------------------------------
+
 namespace bbcreaImageIO
 {
 
@@ -46,8 +56,43 @@ void ItkImagesChooserDialogBox::Process()
     dlg->ShowModal(); 
 
     bbtk::TypeInfo typ = bbitk::GetITKImagePtrTypeInfoFromPixelTypeInfoAndDimension(*dlg->getTypes().front(), dlg->getDims().front());
-    BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, Export);
-    BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, ExportVTK);
+
+    BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 1 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 2 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 3 )
+    else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 3 );
+
+
+    /* Deprecated
+       BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, Export);
+       BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, ExportVTK);
+    */
 
     delete dlg;
 }

diff --git a/src/creaImageIOWxAnySimpleDlg.cpp b/src/creaImageIOWxAnySimpleDlg.cpp
index 926e1181675271f373a4e08021c5670b1fa536a3..58b7d95c0fd57e42fed654352c35bd22bde14f6f 100644 (file)
--- a/src/creaImageIOWxAnySimpleDlg.cpp
+++ b/src/creaImageIOWxAnySimpleDlg.cpp
@@ -29,13 +29,19 @@
 #include "creaImageIOWxAnySimpleDlg.h"
 
 #include "creaImageIOWxGimmickReaderDialog.h"
-#include <itkAnalyzeImageIO.h>
+
+#if ITK_VERSION_MAJOR < 4 //  : WARNING: deprecated in ITK 4.0
+#  include <itkAnalyzeImageIO.h>
+#  include <itkDICOMSeriesFileNames.h>
+#else // ITK_VERSION_MAJOR < 4
+#  include <itkGDCMSeriesFileNames.h>
+#endif // ITK_VERSION_MAJOR < 4
+
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
 #include <itkImage.h>
 #include <itkImageSeriesWriter.h>
 #include <itkGDCMImageIO.h>
-#include <itkDICOMSeriesFileNames.h>
 #include <itkNumericSeriesFileNames.h>
 #include <itkVectorImage.h>
 #include <itkMetaImageIO.h>
@@ -513,7 +519,11 @@ namespace creaImageIO
       {
           typedef itk::Image<short,3> TImage;
           typedef itk::GDCMImageIO GDCMType;
+#if ITK_VERSION_MAJOR < 4
           typedef itk::DICOMSeriesFileNames dicnames;
+#else // ITK_VERSION_MAJOR < 4
+          typedef itk::GDCMSeriesFileNames dicnames;
+#endif // ITK_VERSION_MAJOR < 4
           GDCMType::Pointer gdcmIO = GDCMType::New(); 
           dicnames::Pointer generator = dicnames::New();