X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Preferences_ColorDlg.cxx;h=f8ed909ae6d49faf6ed288514874929219d87fca;hp=6e9bff6e32f55afc0b556dcda9e45d6b7c51eaed;hb=b03a1e600155a03e2ae01e31960837e51831db70;hpb=64ae2f71de80aad56ebd449db68b8d340bccd7bd diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx index 6e9bff6e3..f8ed909ae 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx @@ -1,262 +1,175 @@ -// SMESH SMESHGUI : GUI for SMESH component +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESHGUI : GUI for SMESH component +// File : SMESHGUI_Preferences_ColorDlg.cxx +// Author : Nicolas REJNERI, Open CASCADE S.A.S. +// SMESH includes // -// File : SMESHGUI_Preferences_ColorDlg.cxx -// Author : Nicolas REJNERI -// Module : SMESH -// $Header$ - -using namespace std; #include "SMESHGUI_Preferences_ColorDlg.h" -#include "SMESHGUI.h" -#include "utilities.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a SMESHGUI_Preferences_ColorDlg which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( QWidget* parent, const char* name ) - : QDialog( parent, name, true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) -{ - if ( !name ) - setName( "SMESHGUI_Preferences_ColorDlg" ); - setCaption( tr( "Preferences - Set Color" ) ); - setSizeGripEnabled( TRUE ); - QGridLayout* SMESHGUI_Preferences_ColorDlgLayout = new QGridLayout( this ); - SMESHGUI_Preferences_ColorDlgLayout->setSpacing( 6 ); - SMESHGUI_Preferences_ColorDlgLayout->setMargin( 11 ); - - ButtonGroup1 = new QButtonGroup( tr( "Elements" ), this, "ButtonGroup1" ); - ButtonGroup1->setColumnLayout(0, Qt::Vertical ); - ButtonGroup1->layout()->setSpacing( 0 ); - ButtonGroup1->layout()->setMargin( 0 ); - QGridLayout* ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() ); - ButtonGroup1Layout->setAlignment( Qt::AlignTop ); - ButtonGroup1Layout->setSpacing( 6 ); - ButtonGroup1Layout->setMargin( 11 ); - - TextLabel_Fill = new QLabel( tr( "Fill" ), ButtonGroup1, "TextLabel_2D_Fill" ); - ButtonGroup1Layout->addWidget( TextLabel_Fill, 0, 0 ); - - btnFillColor = new QPushButton( ButtonGroup1, "btnFillColor" ); - btnFillColor->setFixedSize( QSize( 25, 25 ) ); - ButtonGroup1Layout->addWidget( btnFillColor, 0, 1 ); - - TextLabel_Outine = new QLabel( tr( "Outline" ), ButtonGroup1, "TextLabel_2D_Outine" ); - ButtonGroup1Layout->addWidget( TextLabel_Outine, 0, 2 ); - - btnOutlineColor = new QPushButton( ButtonGroup1, "btnOutlineColor" ); - btnOutlineColor->setFixedSize( QSize( 25, 25 ) ); - ButtonGroup1Layout->addWidget( btnOutlineColor, 0, 3 ); - - TextLabel_Width = new QLabel( tr( "Width" ), ButtonGroup1, "TextLabel_2D_Width" ); - ButtonGroup1Layout->addWidget( TextLabel_Width, 0, 4 ); - - SpinBox_Width = new QSpinBox( 0, 5, 1, ButtonGroup1, "SpinBox_Width" ); - SpinBox_Width->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); - SpinBox_Width->setWrapping( FALSE ); - SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus ); - ButtonGroup1Layout->addWidget( SpinBox_Width, 0, 5 ); - - TextLabel_BackFace = new QLabel( tr( "Back Face" ), ButtonGroup1, "TextLabel_BackFace" ); - ButtonGroup1Layout->addWidget( TextLabel_BackFace, 1, 0 ); - - btnBackFaceColor = new QPushButton( ButtonGroup1, "btnBackFaceColor" ); - btnBackFaceColor->setFixedSize( QSize( 25, 25 ) ); - ButtonGroup1Layout->addWidget( btnBackFaceColor, 1, 1 ); - - TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1, "TextLabel_ShrinkCoeff" ); - ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 2, 0 ); - - SpinBox_Shrink = new QSpinBox( 20, 100, 1, ButtonGroup1, "SpinBox_Shrink" ); - SpinBox_Shrink->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); - SpinBox_Shrink->setButtonSymbols( QSpinBox::PlusMinus ); - ButtonGroup1Layout->addMultiCellWidget( SpinBox_Shrink, 2, 2, 1, 5); - - SMESHGUI_Preferences_ColorDlgLayout->addWidget( ButtonGroup1, 0, 0 ); - - ButtonGroup2 = new QButtonGroup( tr( "Nodes" ), this, "ButtonGroup2" ); - ButtonGroup2->setColumnLayout(0, Qt::Vertical ); - ButtonGroup2->layout()->setSpacing( 0 ); - ButtonGroup2->layout()->setMargin( 0 ); - QGridLayout* ButtonGroup2Layout = new QGridLayout( ButtonGroup2->layout() ); - ButtonGroup2Layout->setAlignment( Qt::AlignTop ); - ButtonGroup2Layout->setSpacing( 6 ); - ButtonGroup2Layout->setMargin( 11 ); - - TextLabel_Nodes_Color = new QLabel( tr( "Color" ), ButtonGroup2, "TextLabel_Nodes_Color" ); - ButtonGroup2Layout->addWidget( TextLabel_Nodes_Color, 0, 0 ); - - btnNodeColor = new QPushButton( ButtonGroup2, "btnNodeColor" ); - btnNodeColor->setFixedSize( QSize( 25, 25 ) ); - ButtonGroup2Layout->addWidget( btnNodeColor, 0, 1 ); - - TextLabel_Nodes_Size = new QLabel( tr( "Size" ), ButtonGroup2, "TextLabel_Nodes_Size" ); - ButtonGroup2Layout->addWidget( TextLabel_Nodes_Size, 0, 2 ); - - SpinBox_Nodes_Size = new QSpinBox( 0, 5, 1, ButtonGroup2, "SpinBox_Nodes_Size" ); - SpinBox_Nodes_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); - SpinBox_Nodes_Size->setWrapping( FALSE ); - SpinBox_Nodes_Size->setButtonSymbols( QSpinBox::PlusMinus ); - ButtonGroup2Layout->addWidget( SpinBox_Nodes_Size, 0, 3 ); - - SMESHGUI_Preferences_ColorDlgLayout->addWidget( ButtonGroup2, 1, 0 ); - - GroupButtons = new QButtonGroup( this, "GroupButtons" ); - GroupButtons->setColumnLayout(0, Qt::Vertical ); - GroupButtons->layout()->setSpacing( 0 ); - GroupButtons->layout()->setMargin( 0 ); - QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() ); - GroupButtonsLayout->setAlignment( Qt::AlignTop ); - GroupButtonsLayout->setSpacing( 6 ); - GroupButtonsLayout->setMargin( 11 ); - - buttonOk = new QPushButton( tr( "&OK" ), GroupButtons, "buttonOk" ); - buttonOk->setAutoDefault( TRUE ); - buttonOk->setDefault( TRUE ); - GroupButtonsLayout->addWidget( buttonOk, 0, 0 ); - - GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 ); - - buttonCancel = new QPushButton( tr( "&Cancel" ), GroupButtons, "buttonCancel" ); - buttonCancel->setAutoDefault( TRUE ); - GroupButtonsLayout->addWidget( buttonCancel, 0, 2 ); - - SMESHGUI_Preferences_ColorDlgLayout->addWidget( GroupButtons, 2, 0 ); - - Init(); -} - -/* - * Destroys the object and frees any allocated resources - */ -SMESHGUI_Preferences_ColorDlg::~SMESHGUI_Preferences_ColorDlg() -{ - // no need to delete child widgets, Qt does it all for us -} +#include "SMESHGUI.h" +#include "SMESHGUI_Utils.h" -//================================================================================= -// function : Init() -// purpose : -//================================================================================= -void SMESHGUI_Preferences_ColorDlg::Init() -{ - mySMESHGUI = SMESHGUI::GetSMESHGUI() ; - mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ; - - /* signals and slots connections */ - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ) ; +// SALOME GUI includes +#include +#include +#include - connect( btnFillColor, SIGNAL( clicked() ), this, SLOT( SelectFillColor() ) ) ; - connect( btnOutlineColor, SIGNAL( clicked() ), this, SLOT( SelectOutlineColor() ) ) ; - connect( btnNodeColor, SIGNAL( clicked() ), this, SLOT( SelectNodeColor() ) ) ; - connect( btnBackFaceColor, SIGNAL( clicked() ), this, SLOT( SelectBackFaceColor() ) ) ; +// Qt includes +#include +#include +#include +#include +#include +#include +#include - connect( mySMESHGUI, SIGNAL ( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) ) ; - /* to close dialog if study change */ - connect( mySMESHGUI, SIGNAL ( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) ) ; - - /* Move widget on the botton right corner of main widget */ - int x, y ; - mySMESHGUI->DefineDlgPosition( this, x, y ) ; - this->move( x, y ) ; -} +#define SPACING 6 +#define MARGIN 11 //================================================================================= -// function : SelectFillColor() -// purpose : +// function : SMESHGUI_Preferences_ColorDlg() +// purpose : Constructs a SMESHGUI_Preferences_ColorDlg which is a child +// of 'parent', with the name 'name' and widget flags set to 'f' +// The dialog will by default be modeless, unless you +// set'modal' to true to construct a modal dialog. //================================================================================= -void SMESHGUI_Preferences_ColorDlg::SelectFillColor() +SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModule ) + : QDialog( SMESH::GetDesktop( theModule ) ), + mySMESHGUI( theModule ) { - QColor color = btnFillColor->palette().active().button(); - color = QColorDialog::getColor( color ); - if ( color.isValid() ) { - QPalette pal = btnFillColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnFillColor->setPalette(pal); - } -} + setModal( true ); + setWindowTitle( tr( "Preferences - Set Color" ) ); + setSizeGripEnabled( true ); + + // ------------------------------- + QVBoxLayout* topLayout = new QVBoxLayout( this ); + topLayout->setSpacing( SPACING ); + topLayout->setMargin( MARGIN ); + + // ------------------------------- + QGroupBox* ButtonGroup1 = new QGroupBox( tr( "Elements" ), this ); + QGridLayout* ButtonGroup1Layout = new QGridLayout( ButtonGroup1 ); + ButtonGroup1Layout->setSpacing( SPACING ); + ButtonGroup1Layout->setMargin( MARGIN ); + + QLabel* TextLabel_Fill = new QLabel( tr( "Fill" ), ButtonGroup1 ); + btnFillColor = new QtxColorButton( ButtonGroup1 ); + + QLabel* TextLabel_BackFace = new QLabel( tr( "Back Face" ), ButtonGroup1 ); + btnBackFaceColor = new QtxColorButton( ButtonGroup1 ); + + QLabel* TextLabel_Outine = new QLabel( tr( "Outline" ), ButtonGroup1 ); + btnOutlineColor = new QtxColorButton( ButtonGroup1 ); + + QLabel* TextLabel_Width = new QLabel( tr( "Width" ), ButtonGroup1 ); + SpinBox_Width = new QSpinBox( ButtonGroup1 ); + SpinBox_Width->setRange( 0, 5 ); + SpinBox_Width->setSingleStep( 1 ); + SpinBox_Width->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus ); + + QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1 ); + SpinBox_Shrink = new QtxIntSpinBox( ButtonGroup1 ); + SpinBox_Shrink->setRange( 20, 100 ); + SpinBox_Shrink->setSingleStep( 1 ); + SpinBox_Shrink->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + SpinBox_Shrink->setButtonSymbols( QSpinBox::PlusMinus ); + + ButtonGroup1Layout->addWidget( TextLabel_Fill, 0, 0 ); + ButtonGroup1Layout->addWidget( btnFillColor, 0, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_BackFace, 0, 2 ); + ButtonGroup1Layout->addWidget( btnBackFaceColor, 0, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_Outine, 1, 0 ); + ButtonGroup1Layout->addWidget( btnOutlineColor, 1, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_Width, 1, 2 ); + ButtonGroup1Layout->addWidget( SpinBox_Width, 1, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 2, 0 ); + ButtonGroup1Layout->addWidget( SpinBox_Shrink, 2, 1, 1, 3 ); + + // ------------------------------- + QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this ); + QHBoxLayout* ButtonGroup2Layout = new QHBoxLayout( ButtonGroup2 ); + ButtonGroup2Layout->setSpacing( SPACING ); + ButtonGroup2Layout->setMargin( MARGIN ); + + QLabel* TextLabel_Nodes_Color = new QLabel( tr( "Color" ), ButtonGroup2 ); + btnNodeColor = new QtxColorButton( ButtonGroup2 ); + + QLabel* TextLabel_Nodes_Size = new QLabel( tr( "Size" ), ButtonGroup2 ); + SpinBox_Nodes_Size = new QSpinBox( ButtonGroup2 ); + SpinBox_Nodes_Size->setRange( 0, 5 ); + SpinBox_Nodes_Size->setSingleStep( 1 ); + SpinBox_Nodes_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + SpinBox_Nodes_Size->setButtonSymbols( QSpinBox::PlusMinus ); + + ButtonGroup2Layout->addWidget( TextLabel_Nodes_Color ); + ButtonGroup2Layout->addWidget( btnNodeColor ); + ButtonGroup2Layout->addWidget( TextLabel_Nodes_Size ); + ButtonGroup2Layout->addWidget( SpinBox_Nodes_Size ); + + // ------------------------------- + QGroupBox* GroupButtons = new QGroupBox( this ); + QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons ); + GroupButtonsLayout->setSpacing( SPACING ); + GroupButtonsLayout->setMargin( MARGIN ); + + QPushButton* buttonOk = new QPushButton( tr( "&OK" ), GroupButtons ); + buttonOk->setAutoDefault( true ); + buttonOk->setDefault( true ); + + QPushButton* buttonCancel = new QPushButton( tr( "&Cancel" ), GroupButtons ); + buttonCancel->setAutoDefault( true ); + + GroupButtonsLayout->addWidget( buttonOk ); + GroupButtonsLayout->addSpacing( 10 ); + GroupButtonsLayout->addStretch(); + GroupButtonsLayout->addWidget( buttonCancel ); + + // ------------------------------- + topLayout->addWidget( ButtonGroup1 ); + topLayout->addWidget( ButtonGroup2 ); + topLayout->addWidget( GroupButtons ); + + // ------------------------------- + mySMESHGUI->SetActiveDialogBox( this ); -//================================================================================= -// function : SelectBackFaceColor() -// purpose : -//================================================================================= -void SMESHGUI_Preferences_ColorDlg::SelectBackFaceColor() -{ - QColor color = btnBackFaceColor->palette().active().button(); - color = QColorDialog::getColor( color ); - if ( color.isValid() ) { - QPalette pal = btnBackFaceColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnBackFaceColor->setPalette(pal); - } -} + /* signals and slots connections */ + connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); + connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ); -//================================================================================= -// function : SelectOutlineColor() -// purpose : -//================================================================================= -void SMESHGUI_Preferences_ColorDlg::SelectOutlineColor() -{ - QColor color = btnOutlineColor->palette().active().button(); - color = QColorDialog::getColor( color ); - if ( color.isValid() ) { - QPalette pal = btnOutlineColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnOutlineColor->setPalette(pal); - } + connect( mySMESHGUI, SIGNAL ( SignalDeactivateActiveDialog() ), + this, SLOT( DeactivateActiveDialog() ) ); + /* to close dialog if study change */ + connect( mySMESHGUI, SIGNAL ( SignalCloseAllDialogs() ), + this, SLOT( ClickOnCancel() ) ); } //================================================================================= -// function : SelectNodeColor() -// purpose : +// function : ~SMESHGUI_Preferences_ColorDlg() +// purpose : Destructor //================================================================================= -void SMESHGUI_Preferences_ColorDlg::SelectNodeColor() +SMESHGUI_Preferences_ColorDlg::~SMESHGUI_Preferences_ColorDlg() { - QColor color = btnNodeColor->palette().active().button(); - color = QColorDialog::getColor( color ); - if ( color.isValid() ) { - QPalette pal = btnNodeColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnNodeColor->setPalette(pal); - } } //================================================================================= @@ -276,7 +189,7 @@ void SMESHGUI_Preferences_ColorDlg::ClickOnOk() void SMESHGUI_Preferences_ColorDlg::ClickOnCancel() { mySMESHGUI->ResetState(); - reject() ; + reject(); } //================================================================================= @@ -285,18 +198,15 @@ void SMESHGUI_Preferences_ColorDlg::ClickOnCancel() //================================================================================= void SMESHGUI_Preferences_ColorDlg::DeactivateActiveDialog() { - return ; } - - //================================================================================= // function : closeEvent() // purpose : //================================================================================= -void SMESHGUI_Preferences_ColorDlg::closeEvent( QCloseEvent* e ) +void SMESHGUI_Preferences_ColorDlg::closeEvent( QCloseEvent* ) { - this->ClickOnCancel() ; /* same than click on cancel button */ + ClickOnCancel(); /* same than click on cancel button */ } //================================================================================= @@ -306,46 +216,21 @@ void SMESHGUI_Preferences_ColorDlg::closeEvent( QCloseEvent* e ) void SMESHGUI_Preferences_ColorDlg::ActivateThisDialog() { /* Emit a signal to deactivate any active dialog */ - mySMESHGUI->EmitSignalDeactivateDialog() ; - - return ; + mySMESHGUI->EmitSignalDeactivateDialog(); } //================================================================================= // function : SetColor() // purpose : //================================================================================= -void SMESHGUI_Preferences_ColorDlg::SetColor(int type, QColor color) +void SMESHGUI_Preferences_ColorDlg::SetColor( int type, const QColor& color ) { - switch (type) { - case 1 : // fill - { - QPalette pal = btnFillColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnFillColor->setPalette(pal); - break; - } - case 2 : // outline - { - QPalette pal = btnOutlineColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnOutlineColor->setPalette(pal); - break; - } - case 3 : // node - { - QPalette pal = btnNodeColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnNodeColor->setPalette(pal); - break; - } - case 4 : // back face - { - QPalette pal = btnBackFaceColor->palette(); - pal.setColor(QColorGroup::Button, color); - btnBackFaceColor->setPalette(pal); - break; - } + switch ( type ) { + case 1 : btnFillColor->setColor( color ); break; // fill + case 2 : btnOutlineColor->setColor( color ); break; // outline + case 3 : btnNodeColor->setColor( color ); break; // node + case 4 : btnBackFaceColor->setColor( color ); break; // back face + default: break; } } @@ -353,42 +238,45 @@ void SMESHGUI_Preferences_ColorDlg::SetColor(int type, QColor color) // function : GetColor() // purpose : //================================================================================= -QColor SMESHGUI_Preferences_ColorDlg::GetColor(int type) +QColor SMESHGUI_Preferences_ColorDlg::GetColor( int type ) { QColor color; - switch (type) { - case 1 : color = btnFillColor->palette().active().button(); break; // fill - case 2 : color = btnOutlineColor->palette().active().button(); break; // outline - case 3 : color = btnNodeColor->palette().active().button(); break; // node - case 4 : color = btnBackFaceColor->palette().active().button(); break; // back face + switch ( type ) { + case 1 : color = btnFillColor->color(); break; // fill + case 2 : color = btnOutlineColor->color(); break; // outline + case 3 : color = btnNodeColor->color(); break; // node + case 4 : color = btnBackFaceColor->color(); break; // back face + default: break; } return color; } //================================================================================= // function : SetIntValue() -// purpose : +// purpose : //================================================================================= -void SMESHGUI_Preferences_ColorDlg::SetIntValue(int type, int value) +void SMESHGUI_Preferences_ColorDlg::SetIntValue( int type, int value ) { - switch (type) { - case 1 : SpinBox_Width->setValue(value); break; // width - case 2 : SpinBox_Nodes_Size->setValue(value); break; // nodes size = value; break; - case 3 : SpinBox_Shrink->setValue(value); break; // shrink coeff + switch ( type ) { + case 1 : SpinBox_Width->setValue( value ); break; // width + case 2 : SpinBox_Nodes_Size->setValue( value ); break; // nodes size = value; break; + case 3 : SpinBox_Shrink->setValue( value ); break; // shrink coeff + default: break; } } //================================================================================= // function : GetIntValue() -// purpose : +// purpose : //================================================================================= -int SMESHGUI_Preferences_ColorDlg::GetIntValue(int type) +int SMESHGUI_Preferences_ColorDlg::GetIntValue( int type ) { int res = 0; - switch (type) { + switch ( type ) { case 1 : res = SpinBox_Width->value(); break; // width case 2 : res = SpinBox_Nodes_Size->value(); break; // nodes size case 3 : res = SpinBox_Shrink->value(); break; // shrink coeff + default: break; } return res; }