X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=5d053226805a45430b51785d2e0af1d1a6e2ecb9;hb=1be6b124bc950f4d6734c241ce591d662bf3efbc;hp=f69261f6c0b9c8b0238b9190c047a7f00f5e01ea;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index f69261f..5d05322 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -85,7 +85,7 @@ namespace creaImageIO
 					{
 						files.push_back( crea::wx2std(wxArray[i]));
 					}
-					if(!m_view.readFile(files,m_results))
+					if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
 					{
 						//TO DO WARNING MESSAGE;
 					}
@@ -113,7 +113,7 @@ namespace creaImageIO
 		 {  
 			 m_results.clear();
 			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
-			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
 			{
 				//TO DO WARNING MESSAGE;
 			}
@@ -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=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;
+	}
 	  
+
+
 }