#3184 BBTK Feature New Normal - In GetXCoherentInfoGdcmReader box extract Dicom...

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

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index a37304beca30d6ecb9562e799de41b3667abbd05..f0b3c2134f78e455b5feaa81c6b2dfc5d73a2547 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -47,20 +47,25 @@
 #include "vtkImageData.h"
 namespace bbgdcmvtk
 {
+       typedef std::map<std::string, std::string>      MapInfoDicom;
+       typedef std::vector< MapInfoDicom >             VectorMapInfoDicom;
 
 class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
  : 
    public bbtk::AtomicBlackBox
 {
+
   BBTK_BLACK_BOX_INTERFACE(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox);
 
-  BBTK_DECLARE_INPUT(In,            std::vector<std::string>);
-  BBTK_DECLARE_INPUT(IPPSort,       bool);
+  BBTK_DECLARE_INPUT(In                                , std::vector<std::string>);
+  BBTK_DECLARE_INPUT(IPPSort           , bool);
+  BBTK_DECLARE_INPUT(DicomTags         , std::vector<std::string>);
   
-  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(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(DicomInfo                , VectorMapInfoDicom);
        
   BBTK_PROCESS(Process);
   void Process();
@@ -83,18 +88,20 @@ class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
   //=================================================================
   // UserBlackBox description
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox);
-BBTK_NAME("GetXCoherentInfoGdcmReader");
-BBTK_AUTHOR("jpr, eduardo");
-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,     "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_NAME("GetXCoherentInfoGdcmReader");
+  BBTK_AUTHOR("jpr, eduardo");
+  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                             ,"List of Dicom image file names", std::vector<std::string>,"");
+  BBTK_INPUT(GetXCoherentInfoGdcmReader,IPPSort                        ,"Sort on Image Position Patient", bool,"");
+  BBTK_INPUT(GetXCoherentInfoGdcmReader,DicomTags              ,"Dicom Tags (vector of Dicom tags ex: D0028_0030  D0020_0037)", std::vector<std::string>,"");
+
+  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,DicomInfo             ,"vector of maps of Dicom tags" , VectorMapInfoDicom,"");
 BBTK_END_DESCRIBE_BLACK_BOX(GetXCoherentInfoGdcmReader);
 } // EO namespace bbgdcmvtk