X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickPanel.cpp;h=a11e0a306c6ff0d52616c2f36b65e668bc500a9c;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=2b2ebb991e6dbd31b81a5910b07508db462d8d7a;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git diff --git a/src/creaImageIOWxGimmickPanel.cpp b/src/creaImageIOWxGimmickPanel.cpp index 2b2ebb9..a11e0a3 100644 --- a/src/creaImageIOWxGimmickPanel.cpp +++ b/src/creaImageIOWxGimmickPanel.cpp @@ -8,23 +8,23 @@ namespace creaImageIO { // CTor WxGimmickPanel::WxGimmickPanel(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const std::string i_namedescp , - const std::string i_namedb , - int threads) + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const std::string i_namedescp, + const std::string i_namedb, + int threads) : wxPanel( parent, - id, - pos, - size, - wxRESIZE_BORDER | - wxSYSTEM_MENU | - wxCLOSE_BOX | - wxMAXIMIZE_BOX | - wxMINIMIZE_BOX | - wxCAPTION - ), + id, + pos, + size, + wxRESIZE_BORDER | + wxSYSTEM_MENU | + wxCLOSE_BOX | + wxMAXIMIZE_BOX | + wxMINIMIZE_BOX | + wxCAPTION + ), //mGimmick(0), mView(0) { @@ -33,12 +33,11 @@ namespace creaImageIO wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); try { - - mGimmick = boost::shared_ptr(new Gimmick()); - mGimmick->Initialize(i_namedescp,i_namedb); - int min_dim = GIMMICK_2D_IMAGE_SELECTION; - int max_dim = GIMMICK_3D_IMAGE_SELECTION; - mView = new WxGimmickView(mGimmick, + mGimmick = boost::shared_ptr(new Gimmick()); + mGimmick->Initialize(i_namedescp,i_namedb); + int min_dim = GIMMICK_2D_IMAGE_SELECTION; + int max_dim = GIMMICK_3D_IMAGE_SELECTION; + mView = new WxGimmickView(mGimmick, this, -1, wxDefaultPosition, @@ -46,9 +45,9 @@ namespace creaImageIO min_dim, max_dim, threads); - mView->Initialize(); + mView->Initialize(); // Connect the AddProgress callback - mView->ConnectValidationObserver ( boost::bind( &WxGimmickPanel::OnSelectedImage , this, _1 ) ); + mView->ConnectValidationObserver ( boost::bind( &WxGimmickPanel::OnSelectedImage , this, _1 ) ); } catch (crea::Exception e) { @@ -84,7 +83,7 @@ namespace creaImageIO ///Callback method on a selection void WxGimmickPanel::OnSelectedImage(bool t) { - mSendImageSignal(t); + mSendImageSignal(t); } void WxGimmickPanel::AddImagesToDB(std::string dir) @@ -103,7 +102,7 @@ namespace creaImageIO //==================================================================== void WxGimmickPanel::ConnectSendImageObserver(SendImageCallbackType callback) { - mSendImageSignal.connect(callback); + mSendImageSignal.connect(callback); } } // EO namespace creaImageIO