X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;fp=src%2FcreaImageIOWxSimpleDlg.cpp;h=a537b32aed81577d8345f07fd585b668115e1f27;hp=db55ad1ca0208959a417f679459d7800ce83cf3f;hb=68975087396fa3f3e1adb04073cd30dc79b535a3;hpb=7e7a6a1fa4b88ed6a998f50aabfa5e66b190cb87

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index db55ad1..a537b32 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -143,27 +143,28 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-			std::vector<creaImageIO::OutStrGimmick> out;
-			std::vector<std::string> attr;
 				dlg.stopReading();
-				dlg.getSelected(out, attr,true,"");
+
+				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
+
 			m_results.clear();
-			int size=(int)out.size();
+			int size=(int)outStrGimmick.size();
 			int ii;
-			if(!bInfo)
-			{
+//			if(!bInfo)
+//			{
 				for (ii=0;ii<size;ii++)
 				{
-					m_results.push_back(out[ii].img);
+					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(out[ii]);
-				}
-			}
+//			} else {
+//				for (ii=0;ii<size;ii++)
+//				{
+//					m_resultsInfo.push_back(outStrGimmick[ii]);
+//				}
+//			}
+
 			dlg.OnExit();
 		 }
 		 SetReturnCode( dlg.GetReturnCode() );
@@ -183,6 +184,17 @@ namespace creaImageIO
 		  return m_results;
 	  }
 
+	std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
+	{
+		return m_resultsDicomAtr;
+	}
+
+	void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
+	{
+		m_attrDicomTags=attr;
+	}
 	  
+
+
 }