X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=0db2b07fbcd3c436a0872a7a56efa418840d34fb;hb=9e8c95c96acaea8851733d20090bf6de7eed1269;hp=71a4b97a6a4a38ef03c806e62454f3b671e01386;hpb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 71a4b97..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: 2008/12/11 15:30:14 $ - Version: $Revision: 1.16 $ + 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 @@ -61,7 +66,7 @@ namespace bbwx int vmin, int vmax, int value, - int track); + bool track); /// Dtor ~SliderWidget(); /// Events callbacks @@ -74,21 +79,27 @@ namespace bbwx void OnResolutionOfSlider(wxScrollEvent& event); // Accessors + void SetValue(int v) { mwxSlider->SetValue(v); } int GetValue() { return mwxSlider->GetValue(); } + int GetMin() {return min;} + int GetMax() {return max;} 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; - wxSlider *mResolutionOfSlider; - int min; - int max; - int reactiveOnTrack; - wxStaticText *label_vertical; - wxStaticText *label_min; - wxStaticText *label_max; + Slider* mBox; + wxSlider *mwxSlider; + wxSlider *mResolutionOfSlider; + int min; + int max; + bool reactiveOnTrack; + wxStaticText *label_vertical; + wxStaticText *label_min; + wxStaticText *label_max; }; //------------------------------------------------------------------------ //------------------------------------------------------------------------ @@ -105,7 +116,7 @@ namespace bbwx int vmin, int vmax, int value, - int reactiveontrack) + bool reactiveontrack) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box), @@ -125,9 +136,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; @@ -135,8 +146,8 @@ namespace bbwx } else { - sizeX = 20; - sizeY = 2; + sizeX = 20; + sizeY = 2; wxorientation = wxSL_VERTICAL; } @@ -147,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)); @@ -161,21 +172,18 @@ 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 ); @@ -220,8 +228,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 @@ -229,14 +237,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 @@ -250,37 +258,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 ); } } } @@ -291,7 +299,8 @@ namespace bbwx } //------------------------------------------------------------------------- - + + //------------------------------------------------------------------------- SliderWidget::~SliderWidget() { @@ -302,10 +311,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((double) 4 ,(double) 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(); } @@ -348,7 +357,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")); } //------------------------------------------------------------------------- @@ -384,6 +393,14 @@ namespace bbwx mwxSlider->SetRange(min,max); RefreshLabels(); } + + + //------------------------------------------------------------------------- + void SliderWidget::SetReactiveOnTrack(bool ok) + { + reactiveOnTrack = ok; + } + //------------------------------------------------------------------------- @@ -399,33 +416,57 @@ 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(0); - } + //----------------------------------------------------------------- + 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() { + bbtkDebugMessage("process",3, + "Slider "<