X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaImageIOImagesChooserDialogBox.xml;h=5f83018c43f159f903b4ba7ca5ba4ef112858596;hb=0300e66f49dd4dd1fd252f0a343944a3cbd5eb53;hp=5c753905a3a44195ae37c4f18a2fe032d3afcc4e;hpb=239bc68ced8df17fbab55fa97c826e2cb20aec76;p=creaImageIO.git

diff --git a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
index 5c75390..5f83018 100644
--- a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -45,13 +45,34 @@
     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 -->
@@ -59,78 +80,20 @@
   <process>
     <PRE>
         creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
+                dlg.SetAttrDicomTags( bbGetInputDicomTags() );
 		dlg.ShowModal(); 
-		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.
-			  vtkImageData *out;
-			  // creation of a huge vtkImageData!!!!
-			  vtkImageData* first = dlg.getImagesSelected()[0];
-			  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 
-			  }
-			  out->SetExtent(ext);
-			  int dim[3];
-			  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();
-			 }	
-
-//EED Notworking 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);
-		  }
+                bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() );
+		if (dlg.getImagesSelected().size()!=0)
+		{ 
+			bbSetOutputFileName( std::string( dlg.getInfoImage().mb_str() ) );
+			bbSetOutputOut( dlg.getVolumeSelected() );
+
 		} else { 
-	      bbSetOutputOut( NULL );  
-		} 
+			bbSetOutputOut( NULL );
+		} // if dlg.getImagesSelected().size()!=0
         bbSetOutputOutImages( dlg.getImagesSelected());  
+	bbSignalOutputModification(  );
+
     </PRE>
   </process>