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

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
index f676af2..762886d 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
@@ -7,7 +7,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 +24,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 +36,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 +52,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,"");