X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaImageIOImagesChooserDialogBox.xml;h=e24073865f121bf5539f7d2265f750cf81348c06;hb=aa095c927358b5bd78f6145dfd06368dc065349c;hp=9c074739974905f80c56bc69b31866d7d930d969;hpb=74fee11f6fc2f68df04cd41b448bf10cbff2ca24;p=creaImageIO.git

diff --git a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
index 9c07473..e240738 100644
--- a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -45,13 +45,33 @@
     INPUTS/OUTPUTS DECLARATION -->
 
   <input name="Title" type="std::string" description="Title of the dialog"/>
+
+
+
   <typedef>
     <PRE>
-      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+      typedef std::vector<std::string> VectorStringType;</PRE>
   </typedef>
+  <input name="DicomTags" type="VectorStringType" description="Dicom Tags"/>
 
+  <typedef>
+    <PRE>
+      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+  </typedef>
   <output name="Out" type="vtkImageData*" description="The selected image"/>
   <output name="OutImages" type="OutputImagesType" description="Vector of selected images"/>
+
+  <typedef>
+    <PRE>
+      typedef std::map<std::string, std::string> MapInfoDicom;</PRE>
+  </typedef>
+
+  <typedef>
+    <PRE>
+      typedef std::vector< MapInfoDicom > VectorMapInfoDicom;</PRE>
+  </typedef>
+
+  <output name="DicomInfo" type="VectorMapInfoDicom" description="Map of Dicom tags"/>
   
   <!--========================================================================
     PROCESS section -->
@@ -60,12 +80,12 @@
     <PRE>
         creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
 		dlg.ShowModal(); 
+                bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() );
 		if (dlg.getImagesSelected().size()!=0){ 
 		  if(dlg.getImagesSelected().size() ==1)
 		  {
 			bbSetOutputOut( dlg.getImagesSelected()[0] );  
 		  } else {
-printf("EED  creaImageIOWxSimpleDlg 1 \n");
 			  // FCY: it will be a big problem if we have several kind of data in the same folder.
 			  // creation of a huge vtkImageData!!!!
 			  vtkImageData* first = dlg.getImagesSelected()[0];
@@ -101,11 +121,9 @@ printf("EED  creaImageIOWxSimpleDlg 1 \n");
 			  	// differents formats char , short, etc...
 			  	// differents components 1..3  ex. jpg ->RGB 3
 			  	imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
-printf("EED  creaImageIOWxSimpleDlg 2 \n");
   		        	int slice,sizeImageVector=dlg.getImagesSelected().size();
                         	for (slice=0 ; slice<sizeImageVector ; slice++)
 			 	{
-printf("EED  creaImageIOWxSimpleDlg 3 slice %d     sizeImageVector %d\n",slice,sizeImageVector);
 					vtkImageData *img = dlg.getImagesSelected()[slice];
 					memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
 				//img->Delete();
@@ -124,7 +142,6 @@ printf("EED  creaImageIOWxSimpleDlg 3 slice %d     sizeImageVector %d\n",slice,s
 // 			//	(*it)->Delete();
 //			//  }
 
-printf("EED  creaImageIOWxSimpleDlg 4 \n");
 			 	bbSetOutputOut(out);
 			} else {
 			 bbSetOutputOut(first);