X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=9066cb8b034a89965847715807a9766d7eec20c0;hb=5196156e0ab3bdf5ea8205d9cbccf558ca3004ad;hp=49d059506fd799ee627fbd1654d29fb361eacc5a;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 49d0595..9066cb8 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: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/02/10 14:56:50 $
+  Version:   $Revision: 1.19 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -45,7 +45,57 @@
 
 namespace bbwx
 {
+  //--------------------------------------------------------------------------
+  // The widget created by the box 
+  class SliderWidget : public wxPanel 
+  {
+  public:
+    /// Ctor with the two first params the parent window and the creator box
+    /// which must be passed to the WxBlackBoxWidget constructor.
+    /// The other params initialize the widget 
+    SliderWidget(Slider* box, wxWindow *parent,
+		 int orientation,
+		 bool changeresolution,
+		 bool label, 
+		 wxString title,
+		 int vmin,
+		 int vmax,
+		 int value,
+                 bool track);
+    /// Dtor
+    ~SliderWidget();
+    /// Events callbacks
+    /// Called when the slider is moved
+    void OnSliderTrack(wxScrollEvent& event);
+    /// Called when the slider is released
+    void OnSliderRelease(wxScrollEvent& event);
+    /// Called when the little slider which controls the resolution
+    /// of the main slider is moved (if activated)
+    void OnResolutionOfSlider(wxScrollEvent& event);
+
+    // Accessors
+    int  GetValue() { return mwxSlider->GetValue(); }
+    void SetRange(int min, int max);
+    // Update the texts which display the min/max/current values of the slider
+    void RefreshLabels();
+	
+  private:
+    Slider*    mBox;
+    wxSlider   *mwxSlider;
+    wxSlider   *mResolutionOfSlider;
+    int        min;
+    int        max;
+    bool       reactiveOnTrack;
+    wxStaticText	*label_vertical;
+    wxStaticText	*label_min;
+    wxStaticText	*label_max;
+  };
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+
   
+    
   //-------------------------------------------------------------------------
   SliderWidget::SliderWidget(Slider* box, wxWindow *parent,
 			     int orientation,
@@ -55,7 +105,7 @@ namespace bbwx
 			     int vmin,
 			     int vmax,
 			     int value,
-                             int reactiveontrack)
+                             bool reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -75,8 +125,8 @@ namespace bbwx
     long wxorientation=0;
     if (orientation==0) 
       {
-	sizeX			= 2;
-	sizeY			= 40;
+	sizeX		= 2;
+	sizeY		= 40;
 	wxorientation	= wxSL_HORIZONTAL;
 	if (labels==true)
 	  {
@@ -85,8 +135,8 @@ namespace bbwx
       } 
     else 
       {
-	sizeX			= 20;
-	sizeY			= 2;
+	sizeX		= 20;
+	sizeY		= 2;
 	wxorientation	= wxSL_VERTICAL;
       }
     
@@ -111,21 +161,18 @@ namespace bbwx
     // Connecting events to callbacks
     Connect( mwxSlider->GetId(), 
 	     wxEVT_SCROLL_THUMBRELEASE, 
-
 	     (wxObjectEventFunction) 
 	     (void (wxPanel::*)(wxScrollEvent&))
 	     &SliderWidget::OnSliderRelease ); 
 
     Connect( mwxSlider->GetId(),  
 	     wxEVT_SCROLL_THUMBTRACK, 
-
 	     (wxObjectEventFunction) 
 	     (void (wxPanel::*)(wxScrollEvent&))
 	      &SliderWidget::OnSliderTrack ); 
     
     Connect( mwxSlider->GetId(),  
 	     wxEVT_SCROLL_CHANGED, 
-
 	     (wxObjectEventFunction) 
 	     (void (wxPanel::*)(wxScrollEvent&))
 	      &SliderWidget::OnSliderTrack );
@@ -283,7 +330,7 @@ namespace bbwx
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
-    mBox->bbSignalOutputModification("Out");    
+	mBox->bbSignalOutputModification(std::string("Out"));    
     }
     RefreshLabels();
   }
@@ -298,7 +345,7 @@ namespace bbwx
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
-    mBox->bbSignalOutputModification("Out");
+	mBox->bbSignalOutputModification(std::string("Out"));
   }
   //-------------------------------------------------------------------------
   
@@ -359,7 +406,7 @@ namespace bbwx
     bbSetInputOrientation("HORIZONTAL");
     bbSetInputChangeResolution(false);
     bbSetInputLabel(true);
-    bbSetInputReactiveOnTrack(0);    
+    bbSetInputReactiveOnTrack(false);    
   }
   
   //--------------------------------------------------------------------------