Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SewingDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 27dfe06e75e49695312599ab83ce2a0f6bf61e3e..721995c1744329f237453ba3fb1de4b2a7e03d65 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-452,7
+452,7
@@
SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule )
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
- myHelpFileName = "sewing_meshes
_page
.html";
+ myHelpFileName = "sewing_meshes.html";
myActor = 0;
myStoredEntityMode = 0;
myActor = 0;
myStoredEntityMode = 0;
@@
-1243,16
+1243,16
@@
void SMESHGUI_SewingDlg::onMoveBorderEnd(int button)
{
aPRT.node1 = ( aPRT.node1 + size + dn ) % size;
aPRT.node2 = ( aPRT.node2 + size + dn ) % size;
{
aPRT.node1 = ( aPRT.node1 + size + dn ) % size;
aPRT.node2 = ( aPRT.node2 + size + dn ) % size;
- break;
}
}
+ break;
case MOVE_LEFT_2:
case MOVE_RIGHT_2:
if (( isClosed ) ||
( 0 <= aPRT.nodeLast+dn && aPRT.nodeLast+dn < size ))
{
aPRT.nodeLast = ( aPRT.nodeLast + size + dn ) % size;
case MOVE_LEFT_2:
case MOVE_RIGHT_2:
if (( isClosed ) ||
( 0 <= aPRT.nodeLast+dn && aPRT.nodeLast+dn < size ))
{
aPRT.nodeLast = ( aPRT.nodeLast + size + dn ) % size;
- break;
}
}
+ break;
default:
return; // impossible to move
}
default:
return; // impossible to move
}
@@
-1532,7
+1532,7
@@
void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
else if (send == LineEdit6)
myOk6 = false;
else if (send == LineEdit6)
myOk6 = false;
- // hilight entered elements/nodes
+ // hi
gh
light entered elements/nodes
SMDS_Mesh* aMesh = 0;
if (myActor)
SMDS_Mesh* aMesh = 0;
if (myActor)
@@
-1555,7
+1555,7
@@
void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
-
+
if (send == LineEdit1)
myOk1 = true;
else if (send == LineEdit2)
if (send == LineEdit1)
myOk1 = true;
else if (send == LineEdit2)
@@
-1577,22
+1577,22
@@
void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
- bool
isEven
OneExists = false;
+ bool
atLeast
OneExists = false;
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
- if (e)
+ if (e)
+ {
newIndices.Add(e->GetID());
newIndices.Add(e->GetID());
-
- if (!isEvenOneExists)
- isEvenOneExists = true;
+ atLeastOneExists = true;
+ }
}
}
-
+
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
-
- if (
isEven
OneExists) {
+
+ if (
atLeast
OneExists) {
if (send == LineEdit1)
myOk1 = true;
else if(send == LineEdit4)
if (send == LineEdit1)
myOk1 = true;
else if(send == LineEdit4)
@@
-1798,7
+1798,7
@@
void SMESHGUI_SewingDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
-void SMESHGUI_SewingDlg::enterEvent (QEvent*
e
)
+void SMESHGUI_SewingDlg::enterEvent (QEvent*
/*e*/
)
{
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
{
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );