X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetInfoGdcmReader.h;h=57bf9c7b408789b33b73f1bf914c5f13a1e0bcf7;hb=5d332eae2105106da042e76430b810b9efe95c81;hp=f676af2c0ebbab04235d056faa0f36a79f3e07c1;hpb=ce7e5d4d512de510794448effd19c6bbfc878063;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
index f676af2..57bf9c7 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_VTK_
 
 #ifndef __bbgdcmvtkGetInfoGdcmReader_h_INCLUDED__
@@ -7,7 +33,14 @@
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
 
+#if defined USE_GDCM
 #include "vtkGdcmReader.h"
+#endif
+#if defined USE_GDCM2
+#include "vtkGDCMImageReader.h"
+#endif
+
+#include "vtkImageData.h"
 
 namespace bbgdcmvtk
 {
@@ -17,14 +50,6 @@ class bbgdcmvtk_EXPORT GetInfoGdcmReader
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(GetInfoGdcmReader,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
 
   BBTK_DECLARE_INPUT(In,            std::string);
   BBTK_DECLARE_OUTPUT(Out,          vtkImageData *);
@@ -37,8 +62,15 @@ virtual void bbUserDestructor();
   void Process();
   
   private:
+#if defined USE_GDCM
      GDCM_NAME_SPACE::File *f;
-     vtkGdcmReader *reader;
+	 vtkGdcmReader *reader;
+#endif
+#if defined USE_GDCM2
+	 vtkGDCMImageReader *reader;
+#endif
+
+ 
 };
 
   //=================================================================
@@ -46,7 +78,7 @@ virtual void bbUserDestructor();
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(GetInfoGdcmReader,bbtk::AtomicBlackBox);
 BBTK_NAME("GetInfoGdcmReader");
 BBTK_AUTHOR("jpr, eduardo");
-BBTK_DESCRIPTION("Get Dicom info and read (as a vtkImageData)");
+BBTK_DESCRIPTION("Get Dicom info (for a single File) and read (as a vtkImageData)");
 BBTK_CATEGORY("");
 
 BBTK_INPUT(GetInfoGdcmReader,In,           "Dicom image file name",       std::string,"");