X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.h;h=d8a09e8d6b2a73e6a246b03d6ef444c18cf05ded;hb=ec331bfd72e99a47d47c915143a355df274a882b;hp=97064cd4c04d715c24d21b79cc533269f77d4fda;hpb=5ecfbf82eea9a965a11ae9f47377ad900b7253b7;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index 97064cd..d8a09e8 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -7,10 +7,18 @@
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
 
+#if defined(USE_GDCM)
 #include "vtkGdcmReader.h"
+#endif
+
+#if defined(USE_GDCM2)
+#include "vtkGDCMImageReader.h"
+#endif
+
 #include "gdcmFile.h"
 #include "gdcmSerieHelper.h"
 
+#include "vtkImageData.h"
 namespace bbgdcmvtk
 {
 
@@ -19,16 +27,10 @@ class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(GetXCoherentInfoGdcmReader,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::vector<std::string>);
+  BBTK_DECLARE_INPUT(IPPSort,       bool);
+  
   BBTK_DECLARE_OUTPUT(Out,          vtkImageData *);
   BBTK_DECLARE_OUTPUT(IPP,          std::vector<double>);
   BBTK_DECLARE_OUTPUT(IOP,          std::vector<double>);
@@ -38,9 +40,15 @@ virtual void bbUserDestructor();
   void Process();
   
   private:
-     GDCM_NAME_SPACE::File *f;
-     GDCM_NAME_SPACE::SerieHelper *sh;
-     vtkGdcmReader *reader;
+
+#if defined USE_GDCM
+		GDCM_NAME_SPACE::File *f;
+		GDCM_NAME_SPACE::SerieHelper *sh;
+		vtkGdcmReader *reader;
+#endif
+#if defined USE_GDCM2
+		vtkGDCMImageReader *reader;
+#endif
 };
 
   //=================================================================
@@ -48,10 +56,11 @@ virtual void bbUserDestructor();
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox);
 BBTK_NAME("GetXCoherentInfoGdcmReader");
 BBTK_AUTHOR("jpr, eduardo");
-BBTK_DESCRIPTION("Get Dicom info from a File Set and read (as a vtkImageData)");
+BBTK_DESCRIPTION("Get Dicom info from a File Set (a list of Dicom image file names) and read (as a vtkImageData)");
 BBTK_CATEGORY("");
 
-BBTK_INPUT(GetXCoherentInfoGdcmReader,In,"Dicom image file name",std::vector<std::string>,"");
+BBTK_INPUT(GetXCoherentInfoGdcmReader,In,     "List of Dicom image file names", std::vector<std::string>,"");
+BBTK_INPUT(GetXCoherentInfoGdcmReader,IPPSort,"Sort on Image Position Patient",bool,"");
 
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,Out,         "Output image",                vtkImageData *,"");
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,IPP,         "Image Position (Patient)",    std::vector<double>,"");