X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=0db2b07fbcd3c436a0872a7a56efa418840d34fb;hb=0345dcb3faf8bb412c0996a5443cb9b9046423b3;hp=0b4e7b3e568073f7ab18cdac043fc3093d7d392e;hpb=f5d5e297c656fb1304cccd72e9ac347c0bddbd09;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 0b4e7b3..0db2b07 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -1,33 +1,38 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ */ + + +/*========================================================================= Program: bbtk Module: $RCSfile: bbwxSlider.cxx,v $ Language: C++ - Date: $Date: 2009/10/05 22:44:52 $ - Version: $Revision: 1.25 $ + Date: $Date: 2012/11/16 08:52:14 $ + Version: $Revision: 1.27 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* 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. -* ------------------------------------------------------------------------ */ - /** * \file * \brief Short description in one line @@ -81,7 +86,10 @@ namespace bbwx void SetRange(int min, int max); // Update the texts which display the min/max/current values of the slider void RefreshLabels(); - + + void SetReactiveOnTrack(bool ok); + + private: Slider* mBox; wxSlider *mwxSlider; @@ -150,8 +158,8 @@ namespace bbwx mwxSlider = new wxSlider( panel, -1, 0 , 0, 500 , wxDefaultPosition, - wxSize(sizeX,sizeY), - wxorientation | wxlabels ); + wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + // mwxSlider->SetInitialSize(wxSize(sizeX,sizeY)); @@ -291,7 +299,8 @@ namespace bbwx } //------------------------------------------------------------------------- - + + //------------------------------------------------------------------------- SliderWidget::~SliderWidget() { @@ -384,6 +393,14 @@ namespace bbwx mwxSlider->SetRange(min,max); RefreshLabels(); } + + + //------------------------------------------------------------------------- + void SliderWidget::SetReactiveOnTrack(bool ok) + { + reactiveOnTrack = ok; + } + //------------------------------------------------------------------------- @@ -432,9 +449,11 @@ namespace bbwx // desperate try // JPR if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() || bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() ) { - ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ; + ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ; } - + + ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ; + bbSetOutputOut( bbGetInputIn() ); if (bbGetOutputWidget()!=0) { @@ -442,14 +461,12 @@ namespace bbwx } } +//-------------------------------------------------------------------------- void Slider::CreateWidget(wxWindow* parent) { - int orientation=0; if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { orientation=0; } if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } - - // std::cout << "bbGetWxParent = "<