X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickReaderDialog.cpp;h=771bb052998e90da9d38add2825764590a4badfd;hb=HEAD;hp=bce7fc7f4ca08de141d1f1d87bd33b49d4e551e9;hpb=98798bbf1fbbd9faec1dea425789421ffcc60281;p=creaImageIO.git diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp index bce7fc7..771bb05 100644 --- a/src/creaImageIOWxGimmickReaderDialog.cpp +++ b/src/creaImageIOWxGimmickReaderDialog.cpp @@ -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,9 +78,9 @@ namespace creaImageIO min_dim, max_dim, threads); - mView->Initialize(); + mView->Initialize(); // Connect the AddProgress callback - mView->ConnectValidationObserver + mView->ConnectValidationObserver ( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) ); } catch (crea::Exception e) @@ -88,20 +88,15 @@ namespace creaImageIO e.Print(); 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->Enable(false); mtopsizer->Add ( bsizer, 0, wxGROW ); - - SetSizer( mtopsizer ); - + SetSizer( mtopsizer ); Layout(); } @@ -118,7 +113,6 @@ namespace creaImageIO { mGimmick->Finalize(); } - } ///Callback method on a selection