avoid warnings

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetXCoherentInfoGdcmReader.h

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index 858a4909f7be572405674e64b1e5fca3b0c38f95..e509431b32c1de8d1ec6cff918119d0478d0a1c5 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -6,8 +6,14 @@
 #include "bbgdcmvtk_EXPORT.h"
 #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"
 
@@ -19,29 +25,28 @@ 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>);
   BBTK_DECLARE_OUTPUT(PixelSpacing, std::vector<double>);
-  BBTK_DECLARE_OUTPUT(InterSlice,   double);
        
   BBTK_PROCESS(Process);
   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
 };
 
   //=================================================================
@@ -49,16 +54,16 @@ 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>,"");
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,IOP,         "Image Orientation (Patient)", std::vector<double>,"");
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,PixelSpacing,"Pixel Spacing",               std::vector<double>,"");
-BBTK_OUTPUT(GetXCoherentInfoGdcmReader,InterSlice,  "InterSlice",                  double,"");
 BBTK_END_DESCRIBE_BLACK_BOX(GetXCoherentInfoGdcmReader);
 } // EO namespace bbgdcmvtk