X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=7022095c01e2c408af665f21f22e4b0cd15117f6;hb=577d0cb2396a5db3124e2277af2c6dfb80b633f1;hp=5345a005150e3292de99bd7f5ff2ed35fba62cd7;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 5345a00..7022095 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbwxSlider.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:53 $ - Version: $Revision: 1.11 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2009/04/16 14:17:50 $ + Version: $Revision: 1.22 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 @@ -32,7 +45,58 @@ namespace bbwx { + //-------------------------------------------------------------------------- + // The widget created by the box + class SliderWidget : public wxPanel + { + public: + /// Ctor with the two first params the parent window and the creator box + /// which must be passed to the WxBlackBoxWidget constructor. + /// The other params initialize the widget + SliderWidget(Slider* box, wxWindow *parent, + int orientation, + bool changeresolution, + bool label, + wxString title, + int vmin, + int vmax, + int value, + bool track); + /// Dtor + ~SliderWidget(); + /// Events callbacks + /// Called when the slider is moved + void OnSliderTrack(wxScrollEvent& event); + /// Called when the slider is released + void OnSliderRelease(wxScrollEvent& event); + /// Called when the little slider which controls the resolution + /// of the main slider is moved (if activated) + void OnResolutionOfSlider(wxScrollEvent& event); + + // Accessors + void SetValue(int v) { mwxSlider->SetValue(v); } + int GetValue() { return mwxSlider->GetValue(); } + void SetRange(int min, int max); + // Update the texts which display the min/max/current values of the slider + void RefreshLabels(); + + private: + Slider* mBox; + wxSlider *mwxSlider; + wxSlider *mResolutionOfSlider; + int min; + int max; + bool reactiveOnTrack; + wxStaticText *label_vertical; + wxStaticText *label_min; + wxStaticText *label_max; + }; + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + + //------------------------------------------------------------------------- SliderWidget::SliderWidget(Slider* box, wxWindow *parent, int orientation, @@ -42,7 +106,7 @@ namespace bbwx int vmin, int vmax, int value, - int reactiveontrack) + bool reactiveontrack) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box), @@ -62,9 +126,9 @@ namespace bbwx long wxorientation=0; if (orientation==0) { - sizeX = 2; + sizeX = 2; sizeY = 40; - wxorientation = wxSL_HORIZONTAL; + wxorientation = wxSL_HORIZONTAL; if (labels==true) { wxlabels = wxSL_LABELS; @@ -72,8 +136,8 @@ namespace bbwx } else { - sizeX = 20; - sizeY = 2; + sizeX = 20; + sizeY = 2; wxorientation = wxSL_VERTICAL; } @@ -98,19 +162,22 @@ namespace bbwx // Connecting events to callbacks Connect( mwxSlider->GetId(), wxEVT_SCROLL_THUMBRELEASE, - (wxObjectEventFunction) (void (wxPanel::*)(wxScrollEvent&)) &SliderWidget::OnSliderRelease ); Connect( mwxSlider->GetId(), wxEVT_SCROLL_THUMBTRACK, - (wxObjectEventFunction) (void (wxPanel::*)(wxScrollEvent&)) &SliderWidget::OnSliderTrack ); - + Connect( mwxSlider->GetId(), + wxEVT_SCROLL_CHANGED, + (wxObjectEventFunction) + (void (wxPanel::*)(wxScrollEvent&)) + &SliderWidget::OnSliderTrack ); + // If asked : creation of the other little slider which allows to change // the resolution of the main slider if (changeresolution==true){ @@ -151,8 +218,8 @@ namespace bbwx sizer = new wxFlexGridSizer(2); if (title!=_T("")) { - sizer -> Add( new wxStaticText(panel,-1, title ) ); - sizer -> Add( new wxStaticText(panel,-1, _T("") ) ); + sizer->Add( new wxStaticText(panel,-1, title ) ); + sizer->Add( new wxStaticText(panel,-1, _T("") ) ); } } else @@ -160,14 +227,14 @@ namespace bbwx sizer = new wxFlexGridSizer(1); if (title!=_T("")) { - sizer -> Add( new wxStaticText(panel,-1, title ) ); + sizer->Add( new wxStaticText(panel,-1, title ) ); } } - sizer -> Add( mwxSlider,1,wxGROW ); - sizer -> AddGrowableCol(0); + sizer->Add( mwxSlider,1,wxGROW ); + sizer->AddGrowableCol(0); if (mResolutionOfSlider!=NULL) { - sizer -> Add( mResolutionOfSlider ); + sizer->Add( mResolutionOfSlider ); } } else @@ -181,37 +248,37 @@ namespace bbwx label_max = new wxStaticText(panel,-1,_T("")); if (title!=_T("")) { - sizer -> Add( new wxStaticText(panel,-1, title ) ); - sizer -> AddGrowableRow(3); + sizer->Add( new wxStaticText(panel,-1, title ) ); + sizer->AddGrowableRow(3); } else { - sizer -> AddGrowableRow(2); + sizer->AddGrowableRow(2); } - sizer -> Add( label_vertical ); - sizer -> Add( label_min ); - sizer -> Add( mwxSlider,1,wxGROW ); - sizer -> Add( label_max ); + sizer->Add( label_vertical ); + sizer->Add( label_min ); + sizer->Add( mwxSlider,1,wxGROW ); + sizer->Add( label_max ); if (mResolutionOfSlider!=NULL) { - sizer -> Add( mResolutionOfSlider ); + sizer->Add( mResolutionOfSlider ); } } else { if (title!=_T("")) { - sizer -> Add( new wxStaticText(panel,-1, title ) ); - sizer -> AddGrowableRow(1); + sizer->Add( new wxStaticText(panel,-1, title ) ); + sizer->AddGrowableRow(1); } else { - sizer -> AddGrowableRow(0); + sizer->AddGrowableRow(0); } - sizer -> Add( mwxSlider,1,wxGROW ); + sizer->Add( mwxSlider,1,wxGROW ); if (mResolutionOfSlider!=NULL) { - sizer -> Add( mResolutionOfSlider ); + sizer->Add( mResolutionOfSlider ); } } } @@ -233,10 +300,10 @@ namespace bbwx //------------------------------------------------------------------------- void SliderWidget::OnResolutionOfSlider(wxScrollEvent& event) { - int value = mwxSlider->GetValue(); - int delta = (int) (pow( 4 , mResolutionOfSlider->GetValue() )); - int minTmp = value - delta/2; - int maxTmp = value + delta/2; + int value = mwxSlider->GetValue(); + int delta = (int) (pow( 4 , mResolutionOfSlider->GetValue() )); + int minTmp = value - delta/2; + int maxTmp = value + delta/2; if (minTmpbbSetOutputOut( mwxSlider->GetValue() ); mBox->bbSetInputIn( mwxSlider->GetValue() ); // and signal that the output has changed - mBox->bbSignalOutputModification("Out"); + mBox->bbSignalOutputModification(std::string("Out")); } - RefreshLabels(); + RefreshLabels(); } //------------------------------------------------------------------------- @@ -278,7 +346,7 @@ namespace bbwx mBox->bbSetOutputOut( mwxSlider->GetValue() ); mBox->bbSetInputIn( mwxSlider->GetValue() ); // and signal that the output has changed - mBox->bbSignalOutputModification("Out"); + mBox->bbSignalOutputModification(std::string("Out")); } //------------------------------------------------------------------------- @@ -339,16 +407,24 @@ namespace bbwx bbSetInputOrientation("HORIZONTAL"); bbSetInputChangeResolution(false); bbSetInputLabel(true); - bbSetInputReactiveOnTrack(0); + bbSetInputReactiveOnTrack(false); } //-------------------------------------------------------------------------- void Slider::Process() { + bbtkDebugMessage("process",3, + "Slider "<