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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 7022095..0b4e7b3 100644
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/16 14:17:50 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2009/10/05 22:44:52 $
+  Version:   $Revision: 1.25 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -76,6 +76,8 @@ 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();
@@ -301,7 +303,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)
@@ -397,18 +399,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 +428,13 @@ 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()) ;
+      }
+      
     bbSetOutputOut( bbGetInputIn() );
     if (bbGetOutputWidget()!=0)
       {