From e7ba14e2a36189a6ba6d8490c2b4edf3be86f894 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 24 Feb 2016 21:36:38 +0100 Subject: [PATCH] #2854 creaImageIO Feature New Normal - creaImageIOWxSimpleDlg add infoImageSource , modification of infoImages parameter --- src/creaImageIOWxSimpleDlg.cpp | 15 +++++++++++++-- src/creaImageIOWxSimpleDlg.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp index e750b91..ca98430 100644 --- a/src/creaImageIOWxSimpleDlg.cpp +++ b/src/creaImageIOWxSimpleDlg.cpp @@ -79,7 +79,8 @@ namespace creaImageIO if(wxArray.size() >0) { m_results.clear(); - infoimage=_T("FILE(s):")+wxArray[0]; + infoimage = wxArray[0]; + infoimageSource = _T("FILE(s)"); std::vector files; for( int i = 0; i < wxArray.GetCount(); i++) { @@ -112,7 +113,8 @@ namespace creaImageIO if ( resultShowModal==wxID_OK ) { m_results.clear(); - infoimage=_T("DIRECTORY:")+dirDlg->GetPath(); + infoimage = dirDlg->GetPath(); + infoimageSource = _T("DIRECTORY"); if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results)) { //TO DO WARNING MESSAGE; @@ -165,6 +167,9 @@ namespace creaImageIO // } // } + infoimage = _T("EED Missing info ???"); + infoimageSource = _T("GIMMICK"); + dlg.OnExit(); } SetReturnCode( dlg.GetReturnCode() ); @@ -177,6 +182,12 @@ namespace creaImageIO return infoimage; } +//----------------------------------------------------------------------------- + wxString WxSimpleDlg::getInfoImageSource() + { + return infoimageSource; + } + ////////////////////////////////////////////////////////////////////// // Return the results vector // ////////////////////////////////////////////////////////////////////// diff --git a/src/creaImageIOWxSimpleDlg.h b/src/creaImageIOWxSimpleDlg.h index f572373..777836e 100644 --- a/src/creaImageIOWxSimpleDlg.h +++ b/src/creaImageIOWxSimpleDlg.h @@ -61,6 +61,7 @@ namespace creaImageIO vtkImageData* getVolumeSelected(); wxString getInfoImage(); + wxString getInfoImageSource(); std::vector< std::map > getDicomInfoImagesSelected(); void SetAttrDicomTags( std::vector attr ); @@ -78,6 +79,7 @@ namespace creaImageIO std::string namedescp; std::string namedb; wxString infoimage; + wxString infoimageSource; /// interface to read data SimpleView m_view; -- 2.44.0