From: jean-pierre roux Date: Thu, 16 Apr 2009 14:17:50 +0000 (+0000) Subject: remove tabs X-Git-Tag: EED.02Oct2009~58 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=577d0cb2396a5db3124e2277af2c6dfb80b633f1;p=bbtk.git remove tabs --- diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index adb884d..7022095 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/03/30 14:42:28 $ - Version: $Revision: 1.21 $ + Date: $Date: 2009/04/16 14:17:50 $ + Version: $Revision: 1.22 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -81,15 +81,15 @@ namespace bbwx void RefreshLabels(); private: - Slider* mBox; - wxSlider *mwxSlider; - wxSlider *mResolutionOfSlider; - int min; - int max; - bool 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; }; //------------------------------------------------------------------------ //------------------------------------------------------------------------ @@ -218,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 @@ -227,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 @@ -248,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 ); } } } @@ -300,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 (minTmpbbSetOutputOut( mwxSlider->GetValue() ); mBox->bbSetInputIn( mwxSlider->GetValue() ); // and signal that the output has changed - mBox->bbSignalOutputModification(std::string("Out")); + mBox->bbSignalOutputModification(std::string("Out")); } RefreshLabels(); } @@ -346,7 +346,7 @@ namespace bbwx mBox->bbSetOutputOut( mwxSlider->GetValue() ); mBox->bbSetInputIn( mwxSlider->GetValue() ); // and signal that the output has changed - mBox->bbSignalOutputModification(std::string("Out")); + mBox->bbSignalOutputModification(std::string("Out")); } //-------------------------------------------------------------------------