X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaImageIOGimmick.xml;h=248a86840199d9e1d35906345202beb526640748;hb=0d75ab3cb25deacda0547d4156ebef481396c62e;hp=8113d5c66fd6998b7ed4e15b9c74fc774ea1de8b;hpb=11e2ea359bee86f7601ea92cbcf8652a2d956c9a;p=creaImageIO.git

diff --git a/bbtk/src/bbcreaImageIOGimmick.xml b/bbtk/src/bbcreaImageIOGimmick.xml
index 8113d5c..248a868 100644
--- a/bbtk/src/bbcreaImageIOGimmick.xml
+++ b/bbtk/src/bbcreaImageIOGimmick.xml
@@ -21,6 +21,25 @@
   <input name="ImageOutputDimension" type="int"         description="The dimensionality of the output image, e.g. 2 for a 2D image, 3 for a 3D image,..."/>
   <input name="Output"               type="int"         description="What to output ? 0(default)=image and filenames/1=only filenames"/>
 
+  <typedef>
+    <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::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"/>
+
+
   <typedef><PRE>typedef std::vector<std::string>   OutputFilesType; </PRE></typedef>
   <typedef><PRE>typedef std::vector<vtkImageData*> OutputImagesType;</PRE></typedef>
 
@@ -46,7 +65,7 @@
                                   bbGetInputImageOutputDimension(),
                                   threads);
    w.ShowModal();
-     
+/*     
    if (w.GetReturnCode() == wxID_OK)
      {
        if (bbGetInputOutput()==0) 
@@ -68,6 +87,64 @@
 //          bbSetOutputOut(0);
 //     }
      }
+*/
+
+
+
+		/// vtkImageData vector
+		std::vector<vtkImageData*> 							m_results;
+		std::vector< std::map<std::string,std::string> > 	m_resultsDicomAtr;
+
+
+		 if (w.GetReturnCode() == wxID_OK)
+	     {
+			w.stopReading();
+			std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+			w.getSelected(outStrGimmick, bbGetInputDicomTags() ,true,"");
+			m_results.clear();
+			int size=(int)outStrGimmick.size();
+			int ii;
+//			if(!bInfo)
+//			{
+				for (ii=0;ii<size;ii++)
+				{
+					outStrGimmick[ii].img->Modified();
+					outStrGimmick[ii].img->Update();
+					m_results.push_back(outStrGimmick[ii].img);
+					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
+				}
+//			} else {
+//				for (ii=0;ii<size;ii++)
+//				{
+//					m_resultsInfo.push_back(outStrGimmick[ii]);
+//				}
+//			}
+
+//			infoimage		=	_T("EED Missing info <void> ???");
+//			infoimageSource	=	_T("GIMMICK");
+
+       if (bbGetInputOutput()==0) 
+         {
+//           std::vector<vtkImageData*> images;
+//           w.GetSelectedImages(images,bbGetInputImageOutputDimension());
+           bbSetOutputOut(m_results[0]);
+           bbSetOutputOut2(m_results);
+         }
+       std::vector<std::string> files;
+       w.GetSelectedFiles(files);
+       bbSetOutputFiles(files);
+
+
+	bbSetOutputDicomInfo( m_resultsDicomAtr );
+
+
+
+			w.OnExit();
+		 }
+
+
+
+
   </PRE></process>