X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetInfoGdcmReader.h;h=973795375cb81afcaae0ab1dca01a66495205874;hb=0589a26d1de5c18fed06165b035c0737bf1cf285;hp=229b180bfae821c3624e6a6507efaae2341d357b;hpb=d021943e59f580c60d274e32751f56fd2caf2e2c;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
index 229b180..9737953 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
@@ -7,7 +7,12 @@
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
 
+#if defined USE_GDCM
 #include "vtkGdcmReader.h"
+#endif
+#if defined USE_GDCM2
+#include "vtkGDCMImageReader.h"
+#endif
 
 namespace bbgdcmvtk
 {
@@ -17,14 +22,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 +34,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,10 +50,10 @@ 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,"");
+BBTK_INPUT(GetInfoGdcmReader,In,           "Dicom image file name",       std::string,"");
 
 BBTK_OUTPUT(GetInfoGdcmReader,Out,         "Output image",                vtkImageData *,"");
 BBTK_OUTPUT(GetInfoGdcmReader,IPP,         "Image Position (Patient)",    std::vector<double>,"");