remove tabs

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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 71a4b97a6a4a38ef03c806e62454f3b671e01386..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/12/11 15:30:14 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/04/16 14:17:50 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -61,7 +61,7 @@ namespace bbwx
                 int vmin,
                 int vmax,
                 int value,
-       int track);
+                 bool track);
     /// Dtor
     ~SliderWidget();
     /// Events callbacks
@@ -74,21 +74,22 @@ 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
     void RefreshLabels();
        
   private:
-    Slider*    mBox;
-    wxSlider   *mwxSlider;
-    wxSlider   *mResolutionOfSlider;
-    int        min;
-    int        max;
-    int        reactiveOnTrack;
-    wxStaticText       *label_vertical;
-    wxStaticText       *label_min;
-    wxStaticText       *label_max;
+    Slider*      mBox;
+    wxSlider     *mwxSlider;
+    wxSlider     *mResolutionOfSlider;
+    int          min;
+    int          max;
+    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;
       }
     
@@ -161,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 );
@@ -220,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 
@@ -229,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 
@@ -250,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 ); 
              }
          }
       }
@@ -302,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;
@@ -333,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();
   }
@@ -348,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"));
   }
   //-------------------------------------------------------------------------
   
@@ -409,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)