X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=54c2daa05940057b107516e792f43c6ee432ec00;hb=9a0cff4a61edd2b20bc0d7d00f4509193b8c50b6;hp=7022095c01e2c408af665f21f22e4b0cd15117f6;hpb=577d0cb2396a5db3124e2277af2c6dfb80b633f1;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 7022095..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/04/16 14:17:50 $
-  Version:   $Revision: 1.22 $
+  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
@@ -76,10 +81,15 @@ namespace bbwx
     // 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;
@@ -289,7 +299,8 @@ namespace bbwx
   }
   //-------------------------------------------------------------------------
   
-
+	
+	
   //-------------------------------------------------------------------------
   SliderWidget::~SliderWidget()
   {
@@ -301,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)
@@ -382,6 +393,14 @@ namespace bbwx
     mwxSlider->SetRange(min,max);
     RefreshLabels();
   }
+	
+	
+	//-------------------------------------------------------------------------
+	void SliderWidget::SetReactiveOnTrack(bool ok)
+	{
+		reactiveOnTrack = ok;
+	}
+	
   //-------------------------------------------------------------------------
 
  
@@ -397,18 +416,28 @@ 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(false);    
-  }
+	//-----------------------------------------------------------------	
+	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() 
@@ -416,7 +445,15 @@ namespace bbwx
     bbtkDebugMessage("process",3,
 		     "Slider "<<bbGetName()<<" input="
 		     <<bbGetInputIn()<<std::endl);
-   
+
+// desperate try // JPR
+      if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
+      {    
+		  ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+      }
+
+	  ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
+	  
     bbSetOutputOut( bbGetInputIn() );
     if (bbGetOutputWidget()!=0)
       {
@@ -424,6 +461,7 @@ namespace bbwx
       }
   }
 
+//--------------------------------------------------------------------------
   void Slider::CreateWidget(wxWindow* parent)
   {