X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=9066cb8b034a89965847715807a9766d7eec20c0;hb=5196156e0ab3bdf5ea8205d9cbccf558ca3004ad;hp=fda48f4155037ea441c321a06fb66d885056e243;hpb=27d45a0a00409d959add5549e6ab42d1394b1005;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index fda48f4..9066cb8 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/02/12 20:08:12 $ - Version: $Revision: 1.7 $ - - 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/02/10 14:56:50 $ + Version: $Revision: 1.19 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 @@ -24,21 +37,65 @@ * */ - #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 + 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, @@ -48,7 +105,7 @@ namespace bbwx int vmin, int vmax, int value, - int reactiveontrack) + bool reactiveontrack) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box), @@ -68,8 +125,8 @@ namespace bbwx long wxorientation=0; if (orientation==0) { - sizeX = 2; - sizeY = 40; + sizeX = 2; + sizeY = 40; wxorientation = wxSL_HORIZONTAL; if (labels==true) { @@ -78,8 +135,8 @@ namespace bbwx } else { - sizeX = 20; - sizeY = 2; + sizeX = 20; + sizeY = 2; wxorientation = wxSL_VERTICAL; } @@ -104,19 +161,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){ @@ -225,8 +285,6 @@ namespace bbwx RefreshLabels(); // Insert the sizer in the main panel and refresh the layout panel->SetSizer(sizer); - // panel->SetAutoLayout(true); - // panel->Layout(); } //------------------------------------------------------------------------- @@ -268,12 +326,13 @@ namespace bbwx { // When user releases the slider // we update the output of the box + mBox->bbSetOutputOut( mwxSlider->GetValue() ); mBox->bbSetInputIn( mwxSlider->GetValue() ); // and signal that the output has changed - mBox->bbSignalOutputModification("Out"); + mBox->bbSignalOutputModification(std::string("Out")); } - RefreshLabels(); + RefreshLabels(); } //------------------------------------------------------------------------- @@ -286,7 +345,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")); } //------------------------------------------------------------------------- @@ -334,7 +393,7 @@ 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); //-------------------------------------------------------------------------- @@ -347,7 +406,7 @@ namespace bbwx bbSetInputOrientation("HORIZONTAL"); bbSetInputChangeResolution(false); bbSetInputLabel(true); - bbSetInputReactiveOnTrack(0); + bbSetInputReactiveOnTrack(false); } //-------------------------------------------------------------------------- @@ -356,25 +415,28 @@ namespace bbwx bbSetOutputOut( bbGetInputIn() ); } - void Slider::CreateWidget() + 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; } - - SliderWidget *w = new SliderWidget(this, - bbGetWxParent(), - orientation , - bbGetInputChangeResolution(), - bbGetInputLabel(), - bbtk::std2wx( bbGetInputTitle() ), - bbGetInputMin(), - bbGetInputMax(), - bbGetInputIn(), - bbGetInputReactiveOnTrack() - ); - // w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); + 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 = "<