X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=3b2d906717b425c257f4aecf6b881abcbb5ae9fd;hb=1a4b973f2cfd974147a10756eb7d2b10ff524ddc;hp=4ddff91c40a516c7ee0f934078eb494794c918fe;hpb=3c2432c5de7bafb15292e8fb6a99bdfb37e0585f;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 4ddff91..3b2d906 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -50,6 +50,7 @@ namespace creaImageIO
 				fileDlg->GetPaths(wxArray);
 				if(wxArray.size() >0)
 				{
+					infoimage=_T("FILE(s):")+wxArray[0];
 					std::vector<std::string> files;
 					for( int i = 0; i < wxArray.GetCount(); i++)
 					{
@@ -59,9 +60,7 @@ namespace creaImageIO
 					{
 						//TO DO WARNING MESSAGE;
 					}
-				}
-				else
-				{
+				} else {
 					// TO DO WARNING MESSAGES
 				}
 			}
@@ -83,6 +82,7 @@ namespace creaImageIO
 		 resultShowModal = dirDlg->ShowModal();
 		 if ( resultShowModal==wxID_OK )
 		 {  
+			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
 			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
 			{
 				//TO DO WARNING MESSAGE;
@@ -113,15 +113,17 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
+	//		infoimage=_T("DICOM: ???_EED_???");
 //EED 07JUIN2010			dlg.GetSelectedImages(m_results,3);
 			std::vector<creaImageIO::OutStrGimmick> out;
 			std::vector<std::string> attr;
 //				attr.push_back("D0028_0010");
 //				attr.push_back("D0008_0023");
 //				attr.push_back("D0008_1070");
-				w.getSelected(out, attr,true,"");
+				dlg.stopReading();
+				dlg.getSelected(out, attr,true,"");
 //				crea::VtkBasicSlicer(out.front().img);
-			m_results->clean();
+			m_results.clear();
 			int size=out.size();
 			int ii;
 			for (ii=0;ii<size;ii++)
@@ -136,6 +138,11 @@ namespace creaImageIO
 		 EndModal( dlg.GetReturnCode() );
 	   }
 
+	wxString WxSimpleDlg::getInfoImage()
+	{
+		return infoimage;
+	}
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector										//
 //////////////////////////////////////////////////////////////////////