From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Thu, 16 Apr 2009 16:08:23 +0000 (+0000)
Subject: Fix min max troubles
X-Git-Tag: EED.02Oct2009~56
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=90a3b8cf3681909afa77662aecb5be88cec0beb3;p=bbtk.git

Fix min max troubles
---

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 7022095..1a5bd25 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/04/16 16:08:23 $
+  Version:   $Revision: 1.23 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -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();
@@ -416,7 +418,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)
       {
diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index c3a763c..f899a41 100644
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.h,v $
   Language:  C++
-  Date:      $Date: 2009/02/10 14:56:50 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/04/16 16:08:23 $
+  Version:   $Revision: 1.17 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -63,15 +63,11 @@
 // bbPACKAGENAME
 namespace bbwx
 {
-  
-   
 
-  
   //------------------------------------------------------------------------
   // The black box
   class bbwx_EXPORT Slider : public bbtk::WxBlackBox
-  {
-    
+  {    
     BBTK_BLACK_BOX_INTERFACE(Slider,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,int);
     BBTK_DECLARE_INPUT(Min,int);
@@ -99,19 +95,18 @@ namespace bbwx
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Slider widget (wxSlider)");
-  BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int,"");
-  BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int,"");
-  BBTK_INPUT(Slider,Max,"Maximum value of the slider (default 500)",int,"");
-  BBTK_INPUT(Slider,Label,"Show slider labels ? (default FALSE) ",bool,"");
-  BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ", std::string,"");
-  BBTK_INPUT(Slider,Orientation, "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",std::string,"");
-  BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ",bool,"");
-  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default : FALSE)",bool,"");  
+  BBTK_INPUT(Slider,In,               "Initial position of the slider (default 0)",                          int,         "");
+  BBTK_INPUT(Slider,Min,              "Minimum value of the slider (default 0)",                             int,         "");
+  BBTK_INPUT(Slider,Max,              "Maximum value of the slider (default 500)",                           int,         "");
+  BBTK_INPUT(Slider,Label,            "Show slider labels ? (default FALSE) ",                               bool,        "");
+  BBTK_INPUT(Slider,Title,            "Title shown above the slider (default '') ",                          std::string, "");
+  BBTK_INPUT(Slider,Orientation,      "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",            std::string, "");
+  BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ", bool,        "");
+  BBTK_INPUT(Slider,ReactiveOnTrack,  "Slider sends info when track moves (default : FALSE)",                bool,        "");
+    
   BBTK_OUTPUT(Slider,Out,"Current position of the slider",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Slider);
   //=================================================================
-  
-
 
 } //namespace bbwx