X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickReaderDialog.h;h=8137a73b7d2af91e6e117ed32a102d0b42aad7c4;hb=415955d46ea550c344aa4d2215b8a790e348eb72;hp=0ed3d4ae521295ca9d4d8c8d0523477e1b570bd9;hpb=c6b0d7086b5adbeaa6ea97929068fb80e003091f;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h index 0ed3d4a..8137a73 100644 --- a/src2/creaImageIOWxGimmickReaderDialog.h +++ b/src2/creaImageIOWxGimmickReaderDialog.h @@ -11,24 +11,24 @@ namespace creaImageIO /** * \ingroup GUI */ - + //===================================================================== //===================================================================== - class CREAIMAGEIO_EXPORT WxGimmickReaderDialog : public wxDialog + class CREAIMAGEIO_EXPORT WxGimmickReaderDialog : public wxDialog { public: - WxGimmickReaderDialog(); - WxGimmickReaderDialog(wxWindow *parent, + WxGimmickReaderDialog(); + WxGimmickReaderDialog(wxWindow *parent, const wxWindowID id, wxString title, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, int image_min_dim = GIMMICK_2D_IMAGE_SELECTION, int image_max_dim = GIMMICK_3D_IMAGE_SELECTION, int output_dim = NATIVE, int threads = 0); - - Gimmick* GetGimmick() { return mGimmick; } + + boost::shared_ptr GetGimmick() { return mGimmick; } // typedef WxGimmick ViewType; typedef WxGimmickView::EventType EventType; @@ -38,7 +38,7 @@ namespace creaImageIO //=============================================================================================== //Image Selection //=============================================================================================== - + void GetSelectedImages(std::vector& s, int dim) { mView->GetSelectedImages(s, dim); } @@ -49,18 +49,19 @@ namespace creaImageIO void OnSelChanged(EventType& event); void OnContextualMenu(EventType& event); void OnMenuTest(wxCommandEvent& event); - void OnValid(bool valid); - void OnExit(){mView->StopPlayer();} - // void OnButtonOk(wxCommandEvent& event); - // void OnButtonCancel(wxCommandEvent& event); - + void OnValid(bool valid); + void OnExit(){ mView->StopPlayer(); } + // void OnButtonOk(wxCommandEvent& event); + // void OnButtonCancel(wxCommandEvent& event); + private : - Gimmick* mGimmick; + boost::shared_ptr mGimmick; WxGimmickView* mView; wxButton* mOkButton; wxButton* mCancelButton; + enum {