X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=b0022b214bbb7ac2ef71d008525ab1fcadb28727;hb=103f8756e4e48f909eb4f6db115043d5b08c6f1d;hp=1a5bd25cc019625dba7643f86ccaa455c5c0aee1;hpb=90a3b8cf3681909afa77662aecb5be88cec0beb3;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 1a5bd25..b0022b2 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/04/16 16:08:23 $ - Version: $Revision: 1.23 $ + 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; @@ -143,6 +151,10 @@ namespace bbwx wxorientation = wxSL_VERTICAL; } + + wxSize sizeSliderWidget(25,25); +// int widthSliderWidget = wxDefaultSize; + //--------------------------------------------------------------------- // 1) Creation of the components of the widget // Any top level sub-widget must have the panel returned by panel @@ -150,8 +162,8 @@ namespace bbwx mwxSlider = new wxSlider( panel, -1, 0 , 0, 500 , wxDefaultPosition, - wxSize(sizeX,sizeY), - wxorientation | wxlabels ); + sizeSliderWidget, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + // mwxSlider->SetInitialSize(wxSize(sizeX,sizeY)); @@ -291,7 +303,8 @@ namespace bbwx } //------------------------------------------------------------------------- - + + //------------------------------------------------------------------------- SliderWidget::~SliderWidget() { @@ -303,7 +316,7 @@ namespace bbwx void SliderWidget::OnResolutionOfSlider(wxScrollEvent& event) { int value = mwxSlider->GetValue(); - int delta = (int) (pow( 4 , mResolutionOfSlider->GetValue() )); + int delta = (int) (pow((double) 4 ,(double) mResolutionOfSlider->GetValue() )); int minTmp = value - delta/2; int maxTmp = value + delta/2; if (minTmpSetRange(min,max); RefreshLabels(); } + + + //------------------------------------------------------------------------- + void SliderWidget::SetReactiveOnTrack(bool ok) + { + reactiveOnTrack = ok; + } + //------------------------------------------------------------------------- @@ -399,18 +420,28 @@ namespace bbwx BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider); - //-------------------------------------------------------------------------- - void Slider::bbUserConstructor() - { - bbSetInputIn(0); - bbSetInputMin(0); - bbSetInputMax(500); - bbSetOutputOut(0); - bbSetInputOrientation("HORIZONTAL"); - bbSetInputChangeResolution(false); - bbSetInputLabel(true); - bbSetInputReactiveOnTrack(false); - } + //----------------------------------------------------------------- + void Slider::bbUserSetDefaultValues() + { + bbSetInputIn(0); + bbSetInputMin(0); + bbSetInputMax(500); + bbSetOutputOut(0); + bbSetInputOrientation("HORIZONTAL"); + bbSetInputChangeResolution(false); + bbSetInputLabel(true); + bbSetInputReactiveOnTrack(false); + } + + //----------------------------------------------------------------- + void Slider::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void Slider::bbUserFinalizeProcessing() + { + } //-------------------------------------------------------------------------- void Slider::Process() @@ -418,28 +449,28 @@ namespace bbwx bbtkDebugMessage("process",3, "Slider "<