X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickPanel.cpp;h=2cd7ad097e45976e3c00042ae4c18d17c12b8671;hb=8392c8e1b57464fe92e6280b88f69cabfbac58cf;hp=f72284023970625c8979a6fec8d032e4f13f6916;hpb=36cf4b6daf031e4d5e757b4f732b9bf39d69200c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickPanel.cpp b/src2/creaImageIOWxGimmickPanel.cpp index f722840..2cd7ad0 100644 --- a/src2/creaImageIOWxGimmickPanel.cpp +++ b/src2/creaImageIOWxGimmickPanel.cpp @@ -8,6 +8,8 @@ namespace creaImageIO wxWindowID id, const wxPoint& pos, const wxSize& size, + const std::string i_namedescp , + const std::string i_namedb , int threads) : wxPanel( parent, id, @@ -20,7 +22,7 @@ namespace creaImageIO wxMINIMIZE_BOX | wxCAPTION ), - mGimmick(0), + //mGimmick(0), mView(0) { GimmickDebugMessage(1,"WxGimmickPanel::WxGimmickPanel" @@ -29,9 +31,8 @@ namespace creaImageIO try { - mGimmick = new Gimmick(); - mGimmick->Initialize(); - + 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, @@ -70,7 +71,6 @@ namespace creaImageIO if (mGimmick) { mGimmick->Finalize(); - delete mGimmick; } }