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

Auto-reorder of nodes for "Add Quadratic element" dialog

Browse Source
This commit is contained in:
imn 2014-07-11 12:57:32 +04:00
parent 2b96c0d911
commit 1c3a10f810
2 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -552,19 +552,30 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
myCenterNode->setValidator(new SMESHGUI_IdValidator(this, 1)); myCenterNode->setValidator(new SMESHGUI_IdValidator(this, 1));
myReverseCB = new QCheckBox(tr("SMESH_REVERSE"), GroupArguments); myReverseCB = new QCheckBox(tr("SMESH_REVERSE"), GroupArguments);
myAutomaticPresentation = (myGeomType == SMDSEntity_Quad_Quadrangle || myGeomType == SMDSEntity_BiQuad_Quadrangle ||
myGeomType == SMDSEntity_Quad_Pyramid || myGeomType == SMDSEntity_Quad_Penta ||
myGeomType == SMDSEntity_Quad_Hexa || myGeomType == SMDSEntity_TriQuad_Hexa ) ? new QCheckBox(tr("SMESH_AUTOMATIC_PRESENTATION"), GroupArguments) : 0;
if ( myAutomaticPresentation ) {
myNextPresentationButton = new QPushButton(tr("SMESH_BUT_GET_NEXT_SHAPE"), GroupArguments);
myNextPresentationButton->setAutoDefault(false);
}
aGroupArgumentsLayout->addWidget(aCornerNodesLabel, 0, 0); aGroupArgumentsLayout->addWidget(aCornerNodesLabel, 0, 0);
aGroupArgumentsLayout->addWidget(myCornerSelectButton, 0, 1); aGroupArgumentsLayout->addWidget(myCornerSelectButton, 0, 1);
aGroupArgumentsLayout->addWidget(myCornerNodes, 0, 2); aGroupArgumentsLayout->addWidget(myCornerNodes, 0, 2);
aGroupArgumentsLayout->addWidget(myTable, 1, 0, 1, 3); if ( myAutomaticPresentation ) {
aGroupArgumentsLayout->addWidget(myMidFaceLabel, 2, 0); myAutomaticPresentation->setChecked(true);
aGroupArgumentsLayout->addWidget(myMidFaceSelectButton, 2, 1); aGroupArgumentsLayout->addWidget(myAutomaticPresentation, 1, 0, 1, 2);
aGroupArgumentsLayout->addWidget(myMidFaceNodes, 2, 2); aGroupArgumentsLayout->addWidget(myNextPresentationButton, 1, 2, 1, 1);
aGroupArgumentsLayout->addWidget(myCenterLabel, 3, 0); }
aGroupArgumentsLayout->addWidget(myCenterSelectButton, 3, 1); aGroupArgumentsLayout->addWidget(myTable, 2, 0, 1, 3);
aGroupArgumentsLayout->addWidget(myCenterNode, 3, 2); aGroupArgumentsLayout->addWidget(myMidFaceLabel, 3, 0);
aGroupArgumentsLayout->addWidget(myReverseCB, 4, 0, 1, 3); aGroupArgumentsLayout->addWidget(myMidFaceSelectButton, 3, 1);
aGroupArgumentsLayout->addWidget(myMidFaceNodes, 3, 2);
aGroupArgumentsLayout->addWidget(myCenterLabel, 4, 0);
aGroupArgumentsLayout->addWidget(myCenterSelectButton, 4, 1);
aGroupArgumentsLayout->addWidget(myCenterNode, 4, 2);
aGroupArgumentsLayout->addWidget(myReverseCB, 5, 0, 1, 3);
/***************************************************************/ /***************************************************************/
GroupGroups = new QGroupBox( tr( "SMESH_ADD_TO_GROUP" ), this ); GroupGroups = new QGroupBox( tr( "SMESH_ADD_TO_GROUP" ), this );
GroupGroups->setCheckable( true ); GroupGroups->setCheckable( true );
@ -759,7 +770,10 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog())); connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(reject())); connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(reject())); connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(reject()));
if (myAutomaticPresentation) {
connect(myAutomaticPresentation, SIGNAL(stateChanged(int)), SLOT(SetCurrentSelection()));
connect(myNextPresentationButton, SIGNAL(clicked()), SLOT(SetCurrentSelection()));
}
myCurrentLineEdit = myCornerNodes; myCurrentLineEdit = myCornerNodes;
// set selection mode // set selection mode
@ -1025,7 +1039,6 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
if ( myCurrentLineEdit == myCornerNodes ) if ( myCurrentLineEdit == myCornerNodes )
UpdateTable( allOk ); UpdateTable( allOk );
} }
updateButtons(); updateButtons();
displaySimulation(); displaySimulation();
} }
@ -1041,11 +1054,13 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
BusyLocker lock( myBusy ); BusyLocker lock( myBusy );
QString aCurrentEntry = myEntry; QString aCurrentEntry = myEntry;
QString anOldEditArgument = "";
// clear // clear
myActor = 0; myActor = 0;
if ( myCurrentLineEdit ) if ( myCurrentLineEdit ) {
anOldEditArgument = myCurrentLineEdit->text();
myCurrentLineEdit->setText(""); myCurrentLineEdit->setText("");
}
if (!GroupButtons->isEnabled()) // inactive if (!GroupButtons->isEnabled()) // inactive
return; return;
@ -1111,18 +1126,42 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
updateButtons(); updateButtons();
return; return;
} }
if ( myAutomaticPresentation )
myNextPresentationButton->setEnabled(false);
// get selected nodes // get selected nodes
QString aString = ""; QString aString = "";
int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString); int nbNodes = 0;
while ( aString == "" || anOldEditArgument == aString ) {
if ( myAutomaticPresentation && myAutomaticPresentation->isChecked() ) {
nbNodes = SMESH::GetNameOfSelectedSortedNodes( myGeomType , mySelector, myActor, myShift, aString );
}
else
nbNodes = SMESH::GetNameOfSelectedNodes( mySelector, myActor->getIO(), aString );
if ( aString!= "" && myNbCorners == nbNodes && anOldEditArgument == aString && myAutomaticPresentation && myAutomaticPresentation->isChecked()) {
myShift++;
if ( myShift > nbNodes ) {
myShift = 0;
break;
}
continue;
}
if (myNbCorners != nbNodes && myNbCorners != 1) {
myShift = 0;
break;
}
if ( !myAutomaticPresentation || !myAutomaticPresentation->isChecked() )
break;
}
if ( myCurrentLineEdit ) if ( myCurrentLineEdit )
{ {
if ( myCurrentLineEdit != myCenterNode || nbNodes == 1 ) if ( myCurrentLineEdit != myCenterNode || nbNodes == 1)
myCurrentLineEdit->setText(aString); myCurrentLineEdit->setText(aString);
if ( myCurrentLineEdit == myCornerNodes ) if ( myCurrentLineEdit == myCornerNodes ) {
UpdateTable(); UpdateTable();
if ( myAutomaticPresentation && myAutomaticPresentation->isChecked() && myNbCorners == nbNodes)
myNextPresentationButton->setEnabled(true);
}
} }
else if ( myTable->isEnabled() && nbNodes == 1 ) else if ( myTable->isEnabled() && nbNodes == 1 )
{ {
@ -1130,7 +1169,6 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
if ( theCol == 1 ) if ( theCol == 1 )
myTable->item(theRow, 1)->setText(aString); myTable->item(theRow, 1)->setText(aString);
} }
updateButtons(); updateButtons();
displaySimulation(); displaySimulation();
} }
@ -1219,12 +1257,16 @@ void SMESHGUI_AddQuadraticElementDlg::SetCurrentSelection()
QPushButton* send = (QPushButton*)sender(); QPushButton* send = (QPushButton*)sender();
myCurrentLineEdit = 0; myCurrentLineEdit = 0;
if (send == myCornerSelectButton) if (send == myCornerSelectButton || (QCheckBox*)sender() == myAutomaticPresentation)
myCurrentLineEdit = myCornerNodes; myCurrentLineEdit = myCornerNodes;
else if ( send == myMidFaceSelectButton ) else if ( send == myMidFaceSelectButton )
myCurrentLineEdit = myMidFaceNodes; myCurrentLineEdit = myMidFaceNodes;
else if ( send == myCenterSelectButton ) else if ( send == myCenterSelectButton )
myCurrentLineEdit = myCenterNode; myCurrentLineEdit = myCenterNode;
else if (send == myNextPresentationButton ) {
myShift++;
myCurrentLineEdit = myCornerNodes;
}
if ( myCurrentLineEdit ) if ( myCurrentLineEdit )
{ {

3
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
View File

@ -88,6 +88,7 @@ private:
int myNbMidFaceNodes; int myNbMidFaceNodes;
int myNbCenterNodes; int myNbCenterNodes;
bool myBusy; bool myBusy;
int myShift;
SVTK_Selector* mySelector; SVTK_Selector* mySelector;
SMESH::SMESH_Mesh_var myMesh; SMESH::SMESH_Mesh_var myMesh;
@ -112,6 +113,8 @@ private:
QPushButton* myCenterSelectButton; QPushButton* myCenterSelectButton;
QLineEdit* myCenterNode; QLineEdit* myCenterNode;
QTableWidget* myTable; QTableWidget* myTable;
QCheckBox* myAutomaticPresentation;
QPushButton* myNextPresentationButton;
QCheckBox* myReverseCB; QCheckBox* myReverseCB;
QGroupBox* GroupGroups; QGroupBox* GroupGroups;