X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=4b98476c3d93103fdc6b81f392784c8cf4db2ad9;hb=69b17c9a4db1eacaf9e8ddad61154e32bd8cee21;hp=0abba6ab59d1e3d959446dc413768ed230d231b5;hpb=973bf3496911c8efc97cbfc2090b477a88eceba7;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 0abba6a..4b98476 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,15 +1,16 @@
 #include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
+
 
 namespace creaImageIO
 {
 
+
 	///Ctor
    WxSimpleDlg::WxSimpleDlg(wxWindow *parent, 
-							wxString i_title,  
-							const std::string i_namedescp , 
-							const std::string i_namedb)
-    : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150))
+                            wxString i_title,  
+                            const std::string i_namedescp , 
+                            const std::string i_namedb)
+    : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
    {
 		namedescp	= i_namedescp; 
 		namedb		= i_namedb;
@@ -19,19 +20,19 @@ namespace creaImageIO
 			this->SetTitle(i_title);  
 	   }
 	   // Button to select file(s)
-	   wxButton *fileBut = new wxButton(this, -1,_T("Select a file to display"), wxPoint(10,7) );
+	   wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
   	   Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); 
 
 	   // Button to select directory
-	   wxButton *directoryBut = new wxButton(this, -1,_T("Select a directory to display"), wxPoint(10,40) );
+	   wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
 	   Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory ); 
 
 	   // button to select creaImageIO
-	   wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) );
+	   wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
 	   Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
 	   /// \TODO  Button to select Bruker directory
-	
+	   bInfo = false;
 	Layout(); 
 	
 	}
@@ -50,6 +51,8 @@ namespace creaImageIO
 				fileDlg->GetPaths(wxArray);
 				if(wxArray.size() >0)
 				{
+					m_results.clear();
+					infoimage=_T("FILE(s):")+wxArray[0];
 					std::vector<std::string> files;
 					for( int i = 0; i < wxArray.GetCount(); i++)
 					{
@@ -59,9 +62,7 @@ namespace creaImageIO
 					{
 						//TO DO WARNING MESSAGE;
 					}
-				}
-				else
-				{
+				} else {
 					// TO DO WARNING MESSAGES
 				}
 			}
@@ -83,6 +84,8 @@ namespace creaImageIO
 		 resultShowModal = dirDlg->ShowModal();
 		 if ( resultShowModal==wxID_OK )
 		 {  
+			 m_results.clear();
+			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
 			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
 			{
 				//TO DO WARNING MESSAGE;
@@ -113,14 +116,38 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-			dlg.GetSelectedImages(m_results,3);
+			std::vector<creaImageIO::OutStrGimmick> out;
+			std::vector<std::string> attr;
+				dlg.stopReading();
+				dlg.getSelected(out, attr,true,"");
+			m_results.clear();
+			int size=out.size();
+			int ii;
+			if(!bInfo)
+			{
+				for (ii=0;ii<size;ii++)
+				{
+					m_results.push_back(out[ii].img);
+				}
+			}
+			else
+			{
+				for (ii=0;ii<size;ii++)
+				{
+					m_resultsInfo.push_back(out[ii]);
+				}
+			}
 			dlg.OnExit();
 		 }
 		 SetReturnCode( dlg.GetReturnCode() );
-//		 Close();
 		 EndModal( dlg.GetReturnCode() );
 	   }
 
+	wxString WxSimpleDlg::getInfoImage()
+	{
+		return infoimage;
+	}
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector										//
 //////////////////////////////////////////////////////////////////////
@@ -128,5 +155,7 @@ namespace creaImageIO
 	  {
 		  return m_results;
 	  }
+
+	  
 }