remove tabs

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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 0636b5eddd8025029a12bb35d7a8bcee7ed064f4..7022095c01e2c408af665f21f22e4b0cd15117f6 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/10/17 08:18:32 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2009/04/16 14:17:50 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -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 );
@@ -170,8 +218,8 @@ namespace bbwx
            sizer       = new wxFlexGridSizer(2);
            if (title!=_T(""))
              {
-               sizer   -> Add( new wxStaticText(panel,-1, title ) ); 
-               sizer   -> Add( new wxStaticText(panel,-1, _T("") ) ); 
+               sizer->Add( new wxStaticText(panel,-1, title ) ); 
+               sizer->Add( new wxStaticText(panel,-1, _T("") ) ); 
              }
          } 
        else 
@@ -179,14 +227,14 @@ namespace bbwx
            sizer       = new wxFlexGridSizer(1);
            if (title!=_T(""))
              {
-               sizer   -> Add( new wxStaticText(panel,-1, title ) ); 
+               sizer->Add( new wxStaticText(panel,-1, title ) ); 
              }
          }
-       sizer   -> Add( mwxSlider,1,wxGROW ); 
-       sizer   -> AddGrowableCol(0);
+       sizer->Add( mwxSlider,1,wxGROW ); 
+       sizer->AddGrowableCol(0);
        if (mResolutionOfSlider!=NULL) 
          {
-           sizer       -> Add( mResolutionOfSlider ); 
+           sizer->Add( mResolutionOfSlider ); 
          }
       } 
     else 
@@ -200,37 +248,37 @@ namespace bbwx
            label_max = new wxStaticText(panel,-1,_T(""));
            if (title!=_T(""))
              {
-               sizer   -> Add( new wxStaticText(panel,-1, title ) );
-               sizer   -> AddGrowableRow(3);
+               sizer->Add( new wxStaticText(panel,-1, title ) );
+               sizer->AddGrowableRow(3);
              } 
            else 
              {
-               sizer   -> AddGrowableRow(2);
+               sizer->AddGrowableRow(2);
              }
-           sizer       -> Add( label_vertical );
-           sizer       -> Add( label_min );
-           sizer       -> Add( mwxSlider,1,wxGROW );
-           sizer       -> Add( label_max );
+           sizer->Add( label_vertical );
+           sizer->Add( label_min );
+           sizer->Add( mwxSlider,1,wxGROW );
+           sizer->Add( label_max );
            if (mResolutionOfSlider!=NULL) 
              {
-               sizer   -> Add( mResolutionOfSlider ); 
+               sizer->Add( mResolutionOfSlider ); 
              }
          } 
        else 
          {
            if (title!=_T(""))
              {
-               sizer   -> Add( new wxStaticText(panel,-1, title ) );
-               sizer   -> AddGrowableRow(1);
+               sizer->Add( new wxStaticText(panel,-1, title ) );
+               sizer->AddGrowableRow(1);
              } 
            else 
              {
-               sizer   -> AddGrowableRow(0);
+               sizer->AddGrowableRow(0);
              }
-           sizer       -> Add( mwxSlider,1,wxGROW );
+           sizer->Add( mwxSlider,1,wxGROW );
            if (mResolutionOfSlider!=NULL) 
              {
-               sizer   -> Add( mResolutionOfSlider ); 
+               sizer->Add( mResolutionOfSlider ); 
              }
          }
       }
@@ -252,10 +300,10 @@ namespace bbwx
   //-------------------------------------------------------------------------
   void SliderWidget::OnResolutionOfSlider(wxScrollEvent& event)
   {
-    int value = mwxSlider->GetValue();
-    int delta = (int) (pow( 4 , mResolutionOfSlider->GetValue() ));
-    int minTmp   = value - delta/2;
-    int maxTmp   = value + delta/2;
+    int value  = mwxSlider->GetValue();
+    int delta  = (int) (pow( 4 , mResolutionOfSlider->GetValue() ));
+    int minTmp = value - delta/2;
+    int maxTmp = value + delta/2;
     if (minTmp<min)
       {
        minTmp = min;
@@ -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,16 +407,24 @@ 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()
+  void Slider::CreateWidget(wxWindow* parent)
   {
 
     int orientation=0;
@@ -378,7 +434,7 @@ namespace bbwx
     
     //    std::cout << "bbGetWxParent = "<<bbGetWxParent()<<std::endl;
     SliderWidget *w =  new SliderWidget(this, 
-                                       bbGetWxParent(),
+                                       parent, //bbGetWxParent(),
                                        orientation , 
                                        bbGetInputChangeResolution(), 
                                        bbGetInputLabel(),