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

diff --git a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
index 8310f1c..e240738 100644
--- a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -1,3 +1,30 @@
+<!--
+	# ---------------------------------------------------------------------
+	#
+	# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+	#                        pour la Santé)
+	# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+	# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+	# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+	#
+	#  This software is governed by the CeCILL-B license under French law and 
+	#  abiding by the rules of distribution of free software. You can  use, 
+	#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+	#  license as circulated by CEA, CNRS and INRIA at the following URL 
+	#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+	#  or in the file LICENSE.txt.
+	#
+	#  As a counterpart to the access to the source code and  rights to copy,
+	#  modify and redistribute granted by the license, users are provided only
+	#  with a limited warranty  and the software's author,  the holder of the
+	#  economic rights,  and the successive licensors  have only  limited
+	#  liability. 
+	#
+	#  The fact that you are presently reading this means that you have had
+	#  knowledge of the CeCILL-B license and that you accept its terms.
+	# ------------------------------------------------------------------------
+-->
+
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--==========================================================================
    STARTS THE DESCRIPTION OF THE BLACK BOX -->
@@ -18,27 +45,113 @@
     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 -->
 
   <process>
     <PRE>
-      creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database");
-      dlg.ShowModal();
-	  if (dlg.getImagesSelected().size()!=0){
-	      bbSetOutputOut( dlg.getImagesSelected()[0] ); 
-	  } else {
-	      bbSetOutputOut( NULL ); 
-	  }
-      bbSetOutputOutImages( dlg.getImagesSelected()); 
+        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 {
+			  // 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];
+			  int dim[3];
+			  first->GetDimensions(dim);
+			  if (dim[2]==1){
+			 	 vtkImageData *out;
+			  	out  = vtkImageData::New();
+			  	out->SetScalarType(first->GetScalarType());
+			  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+			  	int ext[6];
+			  	first->GetWholeExtent(ext); 
+			  	if(ext[5] == 0)
+			  	{
+			 	   ext[5] = dlg.getImagesSelected().size()-1;
+			 	 } else {
+					ext[5] = ext[5] * dlg.getImagesSelected().size()-1; // to deal with multiframes 
+			  	} // ext
+			  	out->SetExtent(ext);
+			  	double spac[3];
+			  	first->GetDimensions(dim);
+			  	first->GetSpacing(spac);
+ 			  	if (spac[0]==spac[1])
+                          	{
+                               		spac[2]=spac[0];  
+		          	}
+		          	out->SetSpacing(spac);
+			  	out->SetDimensions(dim[0], dim[1], dlg.getImagesSelected().size() );
+			  	out->AllocateScalars();
+			  	out->Update();
+			  	unsigned long imsize = dim[0] * dim[1];
+			  	imsize = imsize * dim[2];  // deal with multiframes here
+			  	// differents formats char , short, etc...
+			  	// differents components 1..3  ex. jpg ->RGB 3
+			  	imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
+  		        	int slice,sizeImageVector=dlg.getImagesSelected().size();
+                        	for (slice=0 ; slice<sizeImageVector ; slice++)
+			 	{
+					vtkImageData *img = dlg.getImagesSelected()[slice];
+					memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
+				//img->Delete();
+				 } // for slice	
+
+//EED This is NOT working. The iteration over the pointer vtkImageData
+//		      	int slice=0;
+//		      	std::vector<vtkImageData*>::iterator it;
+//		      	for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//			{
+//				  memcpy(out->GetScalarPointer(0,0,slice), (*it)->GetScalarPointer(0,0,0), imsize);
+//				  slice++;
+//			}	
+//		       //for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//			//  {
+// 			//	(*it)->Delete();
+//			//  }
+
+			 	bbSetOutputOut(out);
+			} else {
+			 bbSetOutputOut(first);
+			} // dim
+		  }
+		} else { 
+	        bbSetOutputOut( NULL );  
+	} // dlg.getImagesSelected().size()!=0
+        bbSetOutputOutImages( dlg.getImagesSelected());  
+printf("EED  creaImageIOWxSimpleDlg 5 \n");
     </PRE>
   </process>