X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=49d059506fd799ee627fbd1654d29fb361eacc5a;hb=e9823c2416277e47bdbaabb69dbc40f1ce7edb3d;hp=7039139bfb0be22fedd0688e1708f4ae6b35a071;hpb=555854b9edeeb49fdd03fad2b1274e6d6db6d9f7;p=bbtk.git diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 7039139..49d0595 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/01/22 15:41:35 $ - Version: $Revision: 1.2 $ - - 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: 2008/11/24 15:45:51 $ + Version: $Revision: 1.15 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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,16 +37,11 @@ * */ - #ifdef _USE_WXWIDGETS_ - - #include "bbwxSlider.h" #include "bbwxPackage.h" - - - +#include "bbtkUtilities.h" namespace bbwx { @@ -47,7 +55,7 @@ namespace bbwx int vmin, int vmax, int value, - int reactiveontrack) + int reactiveontrack) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box), @@ -56,12 +64,12 @@ 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; @@ -115,7 +123,13 @@ namespace bbwx (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){ @@ -224,8 +238,6 @@ namespace bbwx RefreshLabels(); // Insert the sizer in the main panel and refresh the layout panel->SetSizer(sizer); - // panel->SetAutoLayout(true); - // panel->Layout(); } //------------------------------------------------------------------------- @@ -267,12 +279,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"); } - RefreshLabels(); + RefreshLabels(); } //------------------------------------------------------------------------- @@ -333,10 +346,9 @@ 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() { @@ -344,24 +356,30 @@ namespace bbwx bbSetInputMin(0); bbSetInputMax(500); bbSetOutputOut(0); - bbSetInputOrientation(0); + bbSetInputOrientation("HORIZONTAL"); bbSetInputChangeResolution(false); bbSetInputLabel(true); bbSetInputReactiveOnTrack(0); } - //-------------------------------------------------------------------------- - + //-------------------------------------------------------------------------- void Slider::Process() { bbSetOutputOut( bbGetInputIn() ); } - void Slider::CreateWidget() + void Slider::CreateWidget(wxWindow* parent) { - bbSetOutputWidget( new SliderWidget(this, - bbGetWxParent(), - bbGetInputOrientation() , + + 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 = "<