X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickReaderDialog.cpp;h=5bf968b2f1f8beeeeac9a5e878a0ff9d59cecd4d;hb=b124b45664473a3ad32c1c8cf680cc3355e4dbd2;hp=3af978666b7d69615c5faf91c29cf2711c71a95a;hpb=79372affb878a3ffd7896b8ffbb06b564c0550ce;p=creaImageIO.git diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp index 3af9786..5bf968b 100644 --- a/src/creaImageIOWxGimmickReaderDialog.cpp +++ b/src/creaImageIOWxGimmickReaderDialog.cpp @@ -35,7 +35,7 @@ namespace creaImageIO { // CTor - WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent, + WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent, wxWindowID id, const std::string i_namedescp, const std::string i_namedb, @@ -46,7 +46,7 @@ namespace creaImageIO int max_dim, int output_dim, // never used ?!? // JPR int threads) - : wxDialog( parent, + : wxDialog( parent, id, title, pos, @@ -67,10 +67,10 @@ namespace creaImageIO try { - mGimmick = boost::shared_ptr(new Gimmick()); - mGimmick->Initialize(i_namedescp,i_namedb); + mGimmick = boost::shared_ptr(new Gimmick()); + mGimmick->Initialize(i_namedescp,i_namedb); - mView = new WxGimmickView(mGimmick, + mView = new WxGimmickView(mGimmick, this, TVID, wxDefaultPosition, @@ -78,21 +78,20 @@ namespace creaImageIO min_dim, max_dim, threads); - mView->Initialize(); + //EED 2021-12-17 + mView->Initialize(); // Connect the AddProgress callback mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) ); } catch (crea::Exception e) { - printf("EED WxGimmickReaderDialog::WxGimmickReaderDialog catch 1\n"); e.Print(); - printf("EED WxGimmickReaderDialog::WxGimmickReaderDialog catch 2\n"); return; } mtopsizer->Add( mView,1,wxGROW,0); wxSizer* bsizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL); - /*mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50)); - mCancelButton = new wxButton(this, wxID_CANCEL, _T("CANCEL"), wxPoint(210,50)); - */ mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this); - mCancelButton = (wxButton*)FindWindowById(GetEscapeId(), this); + //mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50)); + //mCancelButton = new wxButton(this, wxID_CANCEL, _T("CANCEL"), wxPoint(210,50)); + mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this); + mCancelButton = (wxButton*)FindWindowById(GetEscapeId(), this); mOkButton->Enable(false); mtopsizer->Add ( bsizer, 0, wxGROW ); SetSizer( mtopsizer );