X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=adb884da0dabb4f671b06ddc7342b3a3b615e805;hb=a35973b128a2f7130b619a2a11a35cfd418b21b6;hp=c4050e21da4aabb9060d1939302ab428111a4a97;hpb=401110cc0aaef718094bbb31daf18d1fc0de6d89;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index c4050e2..adb884d 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/01/13 09:57:13 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2009/03/30 14:42:28 $
+  Version:   $Revision: 1.21 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -61,7 +61,7 @@ namespace bbwx
 		 int vmin,
 		 int vmax,
 		 int value,
-         int track);
+                 bool track);
     /// Dtor
     ~SliderWidget();
     /// Events callbacks
@@ -74,6 +74,7 @@ namespace bbwx
     void OnResolutionOfSlider(wxScrollEvent& event);
 
     // Accessors
+    void SetValue(int v) { mwxSlider->SetValue(v); }
     int  GetValue() { return mwxSlider->GetValue(); }
     void SetRange(int min, int max);
     // Update the texts which display the min/max/current values of the slider
@@ -85,7 +86,7 @@ namespace bbwx
     wxSlider   *mResolutionOfSlider;
     int        min;
     int        max;
-    int        reactiveOnTrack;
+    bool       reactiveOnTrack;
     wxStaticText	*label_vertical;
     wxStaticText	*label_min;
     wxStaticText	*label_max;
@@ -105,7 +106,7 @@ namespace bbwx
 			     int vmin,
 			     int vmax,
 			     int value,
-                             int reactiveontrack)
+                             bool reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -125,9 +126,9 @@ namespace bbwx
     long wxorientation=0;
     if (orientation==0) 
       {
-	sizeX			= 2;
+	sizeX			= 2; 
 	sizeY			= 40;
-	wxorientation	= wxSL_HORIZONTAL;
+	wxorientation		= wxSL_HORIZONTAL;
 	if (labels==true)
 	  {
 	    wxlabels = wxSL_LABELS;
@@ -135,8 +136,8 @@ namespace bbwx
       } 
     else 
       {
-	sizeX			= 20;
-	sizeY			= 2;
+	sizeX		= 20;
+	sizeY		= 2;
 	wxorientation	= wxSL_VERTICAL;
       }
     
@@ -406,13 +407,21 @@ namespace bbwx
     bbSetInputOrientation("HORIZONTAL");
     bbSetInputChangeResolution(false);
     bbSetInputLabel(true);
-    bbSetInputReactiveOnTrack(0);    
+    bbSetInputReactiveOnTrack(false);    
   }
   
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
+    bbtkDebugMessage("process",3,
+		     "Slider "<<bbGetName()<<" input="
+		     <<bbGetInputIn()<<std::endl);
+   
     bbSetOutputOut( bbGetInputIn() );
+    if (bbGetOutputWidget()!=0)
+      {
+	((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
+      }
   }
 
   void Slider::CreateWidget(wxWindow* parent)