X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=4b5180ae81c8befe3a0a7403353dbd58d4c5a333;hb=2bf7ecfe007d04fd159053e54c201a330df1db5f;hp=5bc3cd7a38195423fc05319efbdc84d1a2d127b9;hpb=517be64c97dd4af922cda7cd182a55cf56d6ac41;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 5bc3cd7..4b5180a 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -5,9 +5,15 @@ namespace creaImageIO
 {
 
 	///Ctor
-   WxSimpleDlg::WxSimpleDlg(wxWindow *parent, wxString i_title)
+   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))
    {
+		namedescp	= i_namedescp; 
+		namedb		= i_namedb;
+
 	   if(!i_title.empty())
 	   {
 			this->SetTitle(i_title);  
@@ -34,14 +40,17 @@ namespace creaImageIO
 //////////////////////////////////////////////////////////////////////
 	  void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
 	  {
-		  wxFileDialog* FD = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+		  int resultShowModal;
+		  wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
     
-			if (FD->ShowModal()==wxID_OK)
+		    resultShowModal = fileDlg->ShowModal();
+			if ( resultShowModal==wxID_OK )
 			{
 				wxArrayString wxArray;
-				FD->GetPaths(wxArray);
+				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++)
 					{
@@ -51,13 +60,13 @@ namespace creaImageIO
 					{
 						//TO DO WARNING MESSAGE;
 					}
-				}
-				else
-				{
+				} else {
 					// TO DO WARNING MESSAGES
 				}
 			}
-		  Close();
+		  SetReturnCode( resultShowModal );
+//		 Close();
+		 EndModal( resultShowModal );
 	  }
 
  //////////////////////////////////////////////////////////////////////
@@ -66,17 +75,22 @@ namespace creaImageIO
 
 	  void WxSimpleDlg::OnReadDirectory(wxCommandEvent &event)
 	  {
+		  int resultShowModal;
 	     long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
-		 wxDirDialog* FD = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style);
+		 wxDirDialog* dirDlg = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style);
 		 
-		 if (FD->ShowModal()==wxID_OK)
+		 resultShowModal = dirDlg->ShowModal();
+		 if ( resultShowModal==wxID_OK )
 		 {  
-			if(! m_view.readDirectory(crea::wx2std(FD->GetPath()),m_results))
+			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
 			{
 				//TO DO WARNING MESSAGE;
 			}
 		 }
-		 Close();
+		 SetReturnCode( resultShowModal );
+//		 Close();
+		 EndModal( resultShowModal );
 	  }
 
 	  //////////////////////////////////////////////////////////////////////
@@ -86,8 +100,10 @@ namespace creaImageIO
 	  void WxSimpleDlg::OnReadGimmick(wxCommandEvent &event)
 	  {
 		  // Run Gimmick
-		   WxGimmickReaderDialog dlg(0,-1, "localdatabase_Descriptor.dscp",
-				   "Local Database", _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+		   WxGimmickReaderDialog dlg(0,-1, 
+				   namedescp,
+				   namedb, 
+				   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
                    wxDefaultPosition,
                    wxSize(810,750),
                    GIMMICK_2D_IMAGE_SELECTION,
@@ -97,12 +113,35 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-			dlg.GetSelectedImages(m_results,3);
+			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");
+				dlg.getSelected(out, attr,true,"");
+//				crea::VtkBasicSlicer(out.front().img);
+			m_results.clear();
+			int size=out.size();
+			int ii;
+			for (ii=0;ii<size;ii++)
+			{
+				m_results.push_back(out[ii].img);
+			}
+
 			dlg.OnExit();
 		 }
-		 Close();
+		 SetReturnCode( dlg.GetReturnCode() );
+//		 Close();
+		 EndModal( dlg.GetReturnCode() );
 	   }
 
+	wxString WxSimpleDlg::getInfoImage()
+	{
+		return infoimage;
+	}
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector										//
 //////////////////////////////////////////////////////////////////////