X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=eae91e794ff77795a26638d626b99b3e201452b5;hb=ab8b8af6ee0f8dc16f70cc2e2f9b724674208398;hp=c71852191f0af6979b527ac287d9de287fa6949b;hpb=4925f2a1f40f97ab30cec57dd1edbd95b7a0e29c;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index c718521..eae91e7 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -1,20 +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/02/06 11:31:40 $ - Version: $Revision: 1.4 $ - - 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: 2012/11/16 08:52:14 $ + Version: $Revision: 1.27 $ =========================================================================*/ + /** * \file * \brief Short description in one line @@ -24,20 +42,71 @@ * */ - #ifdef _USE_WXWIDGETS_ - - #include "bbwxSlider.h" #include "bbwxPackage.h" - - - +#include "bbtkUtilities.h" 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(); } + 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; + bool reactiveOnTrack; + wxStaticText *label_vertical; + wxStaticText *label_min; + wxStaticText *label_max; + }; + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + + //------------------------------------------------------------------------- SliderWidget::SliderWidget(Slider* box, wxWindow *parent, int orientation, @@ -47,7 +116,7 @@ namespace bbwx int vmin, int vmax, int value, - int reactiveontrack) + bool reactiveontrack) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box), @@ -56,20 +125,20 @@ namespace bbwx reactiveOnTrack(reactiveontrack) { wxPanel * panel = this; - + label_min = NULL; label_max = NULL; label_vertical = NULL; mResolutionOfSlider = NULL; - + int sizeX,sizeY; long wxlabels=0; long wxorientation=0; if (orientation==0) { - sizeX = 2; + sizeX = 2; sizeY = 40; - wxorientation = wxSL_HORIZONTAL; + wxorientation = wxSL_HORIZONTAL; if (labels==true) { wxlabels = wxSL_LABELS; @@ -77,11 +146,15 @@ namespace bbwx } else { - sizeX = 20; - sizeY = 2; + sizeX = 20; + sizeY = 2; 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 @@ -89,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)); @@ -103,19 +176,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){ @@ -156,8 +232,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 @@ -165,14 +241,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 @@ -186,37 +262,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 ); } } } @@ -224,12 +300,11 @@ namespace bbwx RefreshLabels(); // Insert the sizer in the main panel and refresh the layout panel->SetSizer(sizer); - // panel->SetAutoLayout(true); - // panel->Layout(); } //------------------------------------------------------------------------- - + + //------------------------------------------------------------------------- SliderWidget::~SliderWidget() { @@ -240,10 +315,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(); + RefreshLabels(); } //------------------------------------------------------------------------- @@ -285,7 +361,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")); } //------------------------------------------------------------------------- @@ -321,6 +397,14 @@ namespace bbwx mwxSlider->SetRange(min,max); RefreshLabels(); } + + + //------------------------------------------------------------------------- + void SliderWidget::SetReactiveOnTrack(bool ok) + { + reactiveOnTrack = ok; + } + //------------------------------------------------------------------------- @@ -333,61 +417,77 @@ namespace bbwx //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- - BBTK_USER_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox); + BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider); - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - void Slider::bbUserConstructor() - { - // bbSetInputWinTitle("Slider"); - bbSetInputIn(0); - bbSetInputMin(0); - bbSetInputMax(500); - bbSetOutputOut(0); - bbSetInputOrientation(0); - 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 "<