MagicBox : support of data synchronization + various related fixes

[bbtk.git] / packages / wx / src / bbwxSlider.cxx

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 49d059506fd799ee627fbd1654d29fb361eacc5a..adb884da0dabb4f671b06ddc7342b3a3b615e805 100644 (file)
--- 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/03/30 14:42:28 $
+  Version:   $Revision: 1.21 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -45,7 +45,58 @@
 
 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
+    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
+    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 +106,7 @@ namespace bbwx
                             int vmin,
                             int vmax,
                             int value,
-                             int reactiveontrack)
+                             bool reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -75,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;
@@ -85,8 +136,8 @@ namespace bbwx
       } 
     else 
       {
-       sizeX                   = 20;
-       sizeY                   = 2;
+       sizeX           = 20;
+       sizeY           = 2;
        wxorientation   = wxSL_VERTICAL;
       }
     
@@ -111,21 +162,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 +331,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 +346,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,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)