X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=a9b1b4b9183fe398b111fa20209fce70e0de55e1;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=3b2d906717b425c257f4aecf6b881abcbb5ae9fd;hpb=1a4b973f2cfd974147a10756eb7d2b10ff524ddc;p=creaImageIO.git diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp index 3b2d906..a9b1b4b 100644 --- a/src/creaImageIOWxSimpleDlg.cpp +++ b/src/creaImageIOWxSimpleDlg.cpp @@ -1,15 +1,19 @@ #include "creaImageIOWxSimpleDlg.h" #include "creaImageIOWxGimmickReaderDialog.h" +//#include +//#include +//#include 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,15 +23,15 @@ 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 @@ -50,6 +54,9 @@ namespace creaImageIO fileDlg->GetPaths(wxArray); if(wxArray.size() >0) { + /* typedef itk::Image< float, 4 > ImageType; + ReadImage(crea::wx2std(wxArray[0]).c_str());*/ + infoimage=_T("FILE(s):")+wxArray[0]; std::vector files; for( int i = 0; i < wxArray.GetCount(); i++)