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

diff --git a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
index 9c07473..d36ef10 100644
--- a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -45,96 +45,58 @@
     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 (vector of Dicom tags ex: D0028_0030  D0020_0037)"/>
 
+  <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="vector of maps of Dicom tags"/>
+  <output name="FileName" type="std::string" description="Selected file name"/>
   
   <!--========================================================================
     PROCESS section -->
 
   <process>
     <PRE>
-        creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
-		dlg.ShowModal(); 
-		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];
-			  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();
-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();
-				 } // 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();
-//			//  }
-
-printf("EED  creaImageIOWxSimpleDlg 4 \n");
-			 	bbSetOutputOut(out);
-			} else {
-			 bbSetOutputOut(first);
-			} // dim
-		  }
-		} else { 
-	        bbSetOutputOut( NULL );  
-	} // dlg.getImagesSelected().size()!=0
-        bbSetOutputOutImages( dlg.getImagesSelected());  
-printf("EED  creaImageIOWxSimpleDlg 5 \n");
+
+//    creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
+    creaImageIO::WxSimpleDlg *dlg = new creaImageIO::WxSimpleDlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
+    dlg->SetAttrDicomTags( bbGetInputDicomTags() );
+	dlg->ShowModal(); 
+	bbSetOutputDicomInfo( dlg->getDicomInfoImagesSelected() );
+	if (dlg->getImagesSelected().size()!=0)
+	{ 
+		bbSetOutputFileName( std::string( dlg->getInfoImage().mb_str() ) );
+		bbSetOutputOut( dlg->getVolumeSelected() );
+	} else { 
+		bbSetOutputOut( NULL );
+	} // if dlg getImagesSelected() size() !=0
+        bbSetOutputOutImages( dlg->getImagesSelected());  
+	bbSignalOutputModification(  );
+	
+	delete dlg;
+
     </PRE>
   </process>