X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=54c2daa05940057b107516e792f43c6ee432ec00;hb=75cedb45ce5353caf2b8cdd6c6f7fcff3b3a6555;hp=1b3db8559cacb13b196b3d3d6af08675039c19bf;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 1b3db85..54c2daa 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: 2009/05/15 14:58:03 $
-  Version:   $Revision: 1.24 $
+  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
@@ -81,7 +86,10 @@ namespace bbwx
     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;
@@ -291,7 +299,8 @@ namespace bbwx
   }
   //-------------------------------------------------------------------------
   
-
+	
+	
   //-------------------------------------------------------------------------
   SliderWidget::~SliderWidget()
   {
@@ -303,7 +312,7 @@ namespace bbwx
   void SliderWidget::OnResolutionOfSlider(wxScrollEvent& event)
   {
     int value  = mwxSlider->GetValue();
-    int delta  = (int) (pow( 4 , mResolutionOfSlider->GetValue() ));
+    int delta  = (int) (pow((double) 4 ,(double) mResolutionOfSlider->GetValue() ));
     int minTmp = value - delta/2;
     int maxTmp = value + delta/2;
     if (minTmp<min)
@@ -384,6 +393,14 @@ namespace bbwx
     mwxSlider->SetRange(min,max);
     RefreshLabels();
   }
+	
+	
+	//-------------------------------------------------------------------------
+	void SliderWidget::SetReactiveOnTrack(bool ok)
+	{
+		reactiveOnTrack = ok;
+	}
+	
   //-------------------------------------------------------------------------
 
  
@@ -432,9 +449,11 @@ namespace bbwx
 // desperate try // JPR
       if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
       {    
-	((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+		  ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
       }
-      
+
+	  ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
+	  
     bbSetOutputOut( bbGetInputIn() );
     if (bbGetOutputWidget()!=0)
       {
@@ -442,6 +461,7 @@ namespace bbwx
       }
   }
 
+//--------------------------------------------------------------------------
   void Slider::CreateWidget(wxWindow* parent)
   {