X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickPanel.cpp;h=2aaa2e625a469900083b03ed96d7db80a4541a79;hb=1be6b124bc950f4d6734c241ce591d662bf3efbc;hp=2b2ebb991e6dbd31b81a5910b07508db462d8d7a;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git diff --git a/src/creaImageIOWxGimmickPanel.cpp b/src/creaImageIOWxGimmickPanel.cpp index 2b2ebb9..2aaa2e6 100644 --- a/src/creaImageIOWxGimmickPanel.cpp +++ b/src/creaImageIOWxGimmickPanel.cpp @@ -1,3 +1,31 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ +*/ + + #include #include #include @@ -8,23 +36,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 +61,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 +73,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 +111,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 +130,7 @@ namespace creaImageIO //==================================================================== void WxGimmickPanel::ConnectSendImageObserver(SendImageCallbackType callback) { - mSendImageSignal.connect(callback); + mSendImageSignal.connect(callback); } } // EO namespace creaImageIO