ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 02:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Qt4 porting.

Browse Source
This commit is contained in:
mkr 2008-03-18 16:24:05 +00:00
parent 23c9cbe96a
commit 24702e4b6a
15 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
View File

@ -70,9 +70,10 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QGridLayout>
#include <qvariant.h>
#include <QVariant>
#include <QCheckBox>
#include <QKeyEvent>
#include <QButtonGroup>
#define SPACING 6
#define MARGIN 11
@ -281,6 +282,7 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
/***************************************************************/
GroupConstructors = new QGroupBox(buttonGrTitle, this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -290,7 +292,7 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
Constructor1->setChecked(true);
GroupConstructorsLayout->addWidget(Constructor1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton( Constructor1, 0 );
/***************************************************************/
GroupC1 = new QGroupBox(grBoxTitle, this);

6
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -78,6 +78,7 @@
#include <QCheckBox>
#include <QTableWidget>
#include <QKeyEvent>
#include <QButtonGroup>
// STL includes
#include <vector>
@ -402,6 +403,7 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
/***************************************************************/
GroupConstructors = new QGroupBox(constructorGrTitle, this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* aGroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
aGroupConstructorsLayout->setSpacing(SPACING);
aGroupConstructorsLayout->setMargin(MARGIN);
@ -409,7 +411,7 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
myRadioButton1 = new QRadioButton(GroupConstructors);
myRadioButton1->setIcon(image0);
aGroupConstructorsLayout->addWidget(myRadioButton1);
aGroupConstructorsLayout->addStretch();
ButtonGroup->addButton(myRadioButton1, 0);
/***************************************************************/
GroupArguments = new QGroupBox(argumentsGrTitle, this);
@ -1058,7 +1060,7 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
// clear table
for ( int row = 0; row < myTable->rowCount(); row++ )
for ( int col = 0; col < myTable->columnCount(); col++ )
myTable->item(row, col)->setText("");
if ( QTableWidgetItem* aTWI = myTable->item(row, col) ) aTWI->setText("");
myTable->setEnabled( false );
}

4
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
View File

@ -56,6 +56,7 @@
#include <QCheckBox>
#include <QComboBox>
#include <QKeyEvent>
#include <QButtonGroup>
// STL includes
#include <set>
@ -88,6 +89,7 @@ SMESHGUI_BuildCompoundDlg::SMESHGUI_BuildCompoundDlg( SMESHGUI* theModule )
/***************************************************************/
GroupConstructors = new QGroupBox(tr("COMPOUND"), this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -96,7 +98,7 @@ SMESHGUI_BuildCompoundDlg::SMESHGUI_BuildCompoundDlg( SMESHGUI* theModule )
Constructor1->setIcon(image0);
Constructor1->setChecked(true);
GroupConstructorsLayout->addWidget(Constructor1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(Constructor1, 0);
/***************************************************************/
GroupName = new QGroupBox(tr("RESULT_NAME"), this);

3
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -77,6 +77,7 @@
#include <QGridLayout>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QButtonGroup>
// VTK includes
#include <vtkProperty.h>
@ -812,6 +813,7 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent)
// constructor
QGroupBox* aPixGrp = new QGroupBox(tr("CONSTRUCTOR"), aFrame);
QButtonGroup* aBtnGrp = new QButtonGroup(this);
QHBoxLayout* aPixGrpLayout = new QHBoxLayout(aPixGrp);
aPixGrpLayout->setMargin(MARGIN); aPixGrpLayout->setSpacing(SPACING);
@ -819,6 +821,7 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent)
aRBut->setIcon(iconCompute);
aRBut->setChecked(true);
aPixGrpLayout->addWidget(aRBut);
aBtnGrp->addButton(aRBut, 0);
// Mesh name

4
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -86,6 +86,7 @@
#include <QVBoxLayout>
#include <QGridLayout>
#include <QKeyEvent>
#include <QButtonGroup>
#define SPACING 6
#define MARGIN 11
@ -329,6 +330,7 @@ SMESHGUI_EditMeshDlg::SMESHGUI_EditMeshDlg (SMESHGUI* theModule,
tr("SMESH_MERGE_NODES"),
this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -337,7 +339,7 @@ SMESHGUI_EditMeshDlg::SMESHGUI_EditMeshDlg (SMESHGUI* theModule,
RadioButton->setIcon(myAction == 1 ? IconMergeElems : IconMergeNodes);
RadioButton->setChecked(true);
GroupConstructorsLayout->addWidget(RadioButton);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(RadioButton, 0);
/***************************************************************/
// Controls for mesh defining

3
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
View File

@ -67,6 +67,7 @@
#include <QLabel>
#include <QRadioButton>
#include <QCheckBox>
#include <QButtonGroup>
// VTK includes
#include <vtkProperty.h>
@ -114,6 +115,7 @@ QWidget* SMESHGUI_MakeNodeAtPointDlg::createMainFrame (QWidget* theParent)
// constructor
QGroupBox* aPixGrp = new QGroupBox(tr("MESH_PASS_THROUGH_POINT"), aFrame);
QButtonGroup* aBtnGrp = new QButtonGroup(this);
QHBoxLayout* aPixGrpLayout = new QHBoxLayout(aPixGrp);
aPixGrpLayout->setMargin(MARGIN);
aPixGrpLayout->setSpacing(SPACING);
@ -122,6 +124,7 @@ QWidget* SMESHGUI_MakeNodeAtPointDlg::createMainFrame (QWidget* theParent)
aRBut->setIcon(iconMoveNode);
aRBut->setChecked(true);
aPixGrpLayout->addWidget(aRBut);
aBtnGrp->addButton(aRBut, 0);
// coordinates

4
src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
View File

@ -70,6 +70,7 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QKeyEvent>
#include <QButtonGroup>
// IDL includes
#include <SALOMEconfig.h>
@ -158,6 +159,7 @@ QWidget* SMESHGUI_MoveNodesDlg::createMainFrame (QWidget* theParent)
//------------------------------------------------------------
QGroupBox* aPixGrp = new QGroupBox(tr("MESH_NODE"), aFrame);
QButtonGroup* aBtnGrp = new QButtonGroup(this);
QHBoxLayout* aPixGrpLayout = new QHBoxLayout(aPixGrp);
aPixGrpLayout->setSpacing(SPACING);
aPixGrpLayout->setMargin(MARGIN);
@ -167,7 +169,7 @@ QWidget* SMESHGUI_MoveNodesDlg::createMainFrame (QWidget* theParent)
aRBut->setChecked(true);
aPixGrpLayout->addWidget(aRBut);
aPixGrpLayout->addStretch();
aBtnGrp->addButton(aRBut, 0);
//------------------------------------------------------------
QGroupBox* anIdGrp = new QGroupBox(tr("SMESH_MOVE"), aFrame);

2
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -400,7 +400,7 @@ void SMESHGUI_MultiEditDlg::Init()
if (myEntityTypeGrp)
connect(myEntityTypeGrp, SIGNAL(buttonClicked(int)), SLOT(on3d2dChanged(int)));
connect(myListBox, SIGNAL(selectionChanged()), SLOT(onListSelectionChanged()));
connect(myListBox, SIGNAL(itemSelectionChanged()), SLOT(onListSelectionChanged()));
onSelectionDone();

8
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
View File

@ -76,6 +76,7 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QKeyEvent>
#include <QButtonGroup>
// IDL includes
#include <SALOMEconfig.h>
@ -226,7 +227,7 @@ SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
{
setModal( false );
setAttribute( Qt::WA_DeleteOnClose, true );
setWindowTitle( "MESH_NODE_TITLE" );
setWindowTitle( tr("MESH_NODE_TITLE") );
setSizeGripEnabled( true );
mySimulation = new SMESH::TNodeSimulation( SMESH::GetViewWindow( mySMESHGUI ) );
@ -240,6 +241,7 @@ SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
/***************************************************************/
GroupConstructors = new QGroupBox( tr( "MESH_NODE" ), this );
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout( GroupConstructors );
GroupConstructorsLayout->setSpacing( SPACING );
GroupConstructorsLayout->setMargin( MARGIN );
@ -247,9 +249,9 @@ SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
Constructor1 = new QRadioButton( GroupConstructors );
Constructor1->setIcon( image0 );
Constructor1->setChecked( true );
GroupConstructorsLayout->addWidget( Constructor1 );
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton( Constructor1, 0 );
/***************************************************************/
GroupCoordinates = new QGroupBox( tr( "SMESH_COORDINATES" ), this );

4
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
View File

@ -62,6 +62,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QButtonGroup>
// IDL includes
#include <SALOMEconfig.h>
@ -96,6 +97,7 @@ SMESHGUI_RemoveElementsDlg
/***************************************************************/
GroupConstructors = new QGroupBox(tr("SMESH_ELEMENTS"), this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -105,7 +107,7 @@ SMESHGUI_RemoveElementsDlg
Constructor1->setChecked(true);
GroupConstructorsLayout->addWidget(Constructor1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(Constructor1, 0);
/***************************************************************/
GroupC1 = new QGroupBox(tr("SMESH_REMOVE"), this);

4
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
View File

@ -62,6 +62,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QButtonGroup>
// IDL includes
#include <SALOMEconfig.h>
@ -96,6 +97,7 @@ SMESHGUI_RemoveNodesDlg
/***************************************************************/
GroupConstructors = new QGroupBox(tr("SMESH_NODES"), this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -105,7 +107,7 @@ SMESHGUI_RemoveNodesDlg
Constructor1->setChecked(true);
GroupConstructorsLayout->addWidget(Constructor1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(Constructor1, 0);
/***************************************************************/
GroupC1 = new QGroupBox(tr("SMESH_REMOVE"), this);

4
src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
View File

@ -54,6 +54,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QButtonGroup>
// IDL includes
#include <SALOMEconfig.h>
@ -99,6 +100,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
"renumbering_nodes_and_elements_page.html#renumbering_nodes_anchor" :
"renumbering_nodes_and_elements_page.html#renumbering_elements_anchor";
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -108,7 +110,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
Constructor1->setChecked(true);
GroupConstructorsLayout->addWidget(Constructor1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(Constructor1, 0);
/***************************************************************/
GroupMesh = new QGroupBox(tr("SMESH_RENUMBERING"), this);

5
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
View File

@ -104,6 +104,7 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule )
/***************************************************************/
GroupConstructors = new QGroupBox(tr("SMESH_ROTATION"), this);
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
@ -112,7 +113,7 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule )
RadioButton1->setIcon(image0);
GroupConstructorsLayout->addWidget(RadioButton1);
GroupConstructorsLayout->addStretch();
ButtonGroup->addButton(RadioButton1, 0);
/***************************************************************/
GroupArguments = new QGroupBox(tr("SMESH_ARGUMENTS"), this);
@ -180,7 +181,7 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule )
SpinBox_Angle = new SMESHGUI_SpinBox(GroupArguments);
// action switch
ActionBox = new QGroupBox(tr("ACTION"), GroupArguments);
ActionBox = new QGroupBox(GroupArguments);
ActionGroup = new QButtonGroup(GroupArguments);
QVBoxLayout* ActionBoxLayout = new QVBoxLayout(ActionBox);
ActionBoxLayout->setSpacing(SPACING);

2
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
View File

@ -188,7 +188,7 @@ SMESHGUI_SymmetryDlg::SMESHGUI_SymmetryDlg( SMESHGUI* theModule )
GroupMirrorLayout->addWidget(SpinBox_DZ, 1, 7);
// switch of action type
ActionBox = new QGroupBox(tr("ACTION"), GroupArguments);
ActionBox = new QGroupBox(GroupArguments);
ActionGroup = new QButtonGroup(GroupArguments);
QVBoxLayout* ActionBoxLayout = new QVBoxLayout(ActionBox);
ActionBoxLayout->addSpacing(SPACING);

2
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
View File

@ -161,7 +161,7 @@ SMESHGUI_TranslationDlg::SMESHGUI_TranslationDlg( SMESHGUI* theModule )
SpinBox2_3 = new SMESHGUI_SpinBox(GroupArguments);
// switch of action type
ActionBox = new QGroupBox(tr("ACTION"), GroupArguments);
ActionBox = new QGroupBox(GroupArguments);
ActionGroup = new QButtonGroup(GroupArguments);
QVBoxLayout* ActionBoxLayout = new QVBoxLayout(ActionBox);
ActionBoxLayout->addSpacing(SPACING);