From: Eduardo Davila Date: Wed, 1 Sep 2010 23:11:41 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~8 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cd223a03edfe512060880aade3004248c48c0e4a;p=creaImageIO.git *** empty log message *** --- diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp index f1e75e8..4b5180a 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 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,6 +113,7 @@ namespace creaImageIO dlg.ShowModal(); if (dlg.GetReturnCode() == wxID_OK) { + infoimage=_T("DICOM: ???_EED_???"); //EED 07JUIN2010 dlg.GetSelectedImages(m_results,3); std::vector out; std::vector attr; @@ -136,6 +137,11 @@ namespace creaImageIO EndModal( dlg.GetReturnCode() ); } + wxString WxSimpleDlg::getInfoImage() + { + return infoimage; + } + ////////////////////////////////////////////////////////////////////// // Return the results vector // ////////////////////////////////////////////////////////////////////// diff --git a/src/creaImageIOWxSimpleDlg.h b/src/creaImageIOWxSimpleDlg.h index 617b87f..5c16190 100644 --- a/src/creaImageIOWxSimpleDlg.h +++ b/src/creaImageIOWxSimpleDlg.h @@ -31,11 +31,14 @@ namespace creaImageIO /// return a vtkImageData vector of selected images, if available std::vector getImagesSelected(); + + wxString getInfoImage(); private: std::string namedescp; std::string namedb; + wxString infoimage; /// interface to read data SimpleView m_view;