X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.h;h=da22dc0151a897ec2d34e01fd76941ec0e8963fc;hb=8ba18df584ba0a409fb042663be9fa76ccb0e0b0;hp=f0b3c2134f78e455b5feaa81c6b2dfc5d73a2547;hpb=19dda39fbfb4f8e1019c4f0dd37aa3afc8a3d1d6;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index f0b3c21..da22dc0 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -60,15 +60,20 @@ class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
   BBTK_DECLARE_INPUT(In				, std::vector<std::string>);
   BBTK_DECLARE_INPUT(IPPSort		, bool);
   BBTK_DECLARE_INPUT(DicomTags		, std::vector<std::string>);
-  
+  BBTK_DECLARE_INPUT(ReadRaw		, bool);
+  BBTK_DECLARE_INPUT(RespectSerieUID, bool);
+
   BBTK_DECLARE_OUTPUT(Out			, vtkImageData *);
+  BBTK_DECLARE_OUTPUT(OutFileNames  , std::vector<std::string>);
   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();
+    
+  void Process2();
   
 	vtkImageData* CreateDefaultImage();
 
@@ -96,12 +101,15 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox);
   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_INPUT(GetXCoherentInfoGdcmReader,ReadRaw		    ,"(default true) false: not read raw just dicom tags", bool,"");
+  BBTK_INPUT(GetXCoherentInfoGdcmReader,RespectSerieUID ,"(default true) Respect Serie UID to be read", bool,"");
+
+  BBTK_OUTPUT(GetXCoherentInfoGdcmReader,Out			,"Output image"					        , vtkImageData *,"");
+  BBTK_OUTPUT(GetXCoherentInfoGdcmReader,OutFileNames   ,"List of the files in the good order"  , std::vector<std::string>,"");
+  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