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 branch 'occ/24009'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SingleEditDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
b3c14cb
..
3c020b3
--- a/
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-172,7
+172,7
@@
QWidget* SMESHGUI_SingleEditDlg::createButtonFrame (QWidget* theParent)
// name : isValid()
// Purpose : Verify validity of input data
//=======================================================================
// name : isValid()
// Purpose : Verify validity of input data
//=======================================================================
-bool SMESHGUI_SingleEditDlg::isValid (const bool
theMess
) const
+bool SMESHGUI_SingleEditDlg::isValid (const bool
/*theMess*/
) const
{
int id1, id2;
return getNodeIds(myEdge->text(), id1, id2);
{
int id1, id2;
return getNodeIds(myEdge->text(), id1, id2);
@@
-333,7
+333,7
@@
static bool findTriangles (const SMDS_MeshNode * theNode1,
//function : onTextChange()
//purpose :
//=======================================================================
//function : onTextChange()
//purpose :
//=======================================================================
-void SMESHGUI_SingleEditDlg::onTextChange (const QString&
theNewText
)
+void SMESHGUI_SingleEditDlg::onTextChange (const QString&
/*theNewText*/
)
{
if (myBusy) return;
BusyLocker lock(myBusy);
{
if (myBusy) return;
BusyLocker lock(myBusy);
@@
-341,7
+341,7
@@
void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText)
myOkBtn->setEnabled(false);
myApplyBtn->setEnabled(false);
myOkBtn->setEnabled(false);
myApplyBtn->setEnabled(false);
- // hilight entered edge
+ // hi
gh
light entered edge
if(myActor){
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
if(myActor){
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
@@
-369,9
+369,9
@@
void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText)
if ( findTriangles(aNode1,aNode2,tria1,tria2) )
{
if ( findTriangles(aNode1,aNode2,tria1,tria2) )
{
- newIndices.push_back( aNode1->GetID() );
- newIndices.push_back( aNode2->GetID() );
-
+
newIndices.push_back( aNode1->GetID() );
+
newIndices.push_back( aNode2->GetID() );
+
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
}
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
}
@@
-410,22
+410,22
@@
void SMESHGUI_SingleEditDlg::onSelectionDone()
if(SMDS_Mesh* aMesh = aVisualObj->GetMesh())
{
const SMDS_MeshElement* tria[2];
if(SMDS_Mesh* aMesh = aVisualObj->GetMesh())
{
const SMDS_MeshElement* tria[2];
-
- bool valid = false;
+
+ bool valid = false;
SVTK_IndexedMapOfIds anIds;
mySelector->GetCompositeIndex(anIO,anIds);
if( anIds.Extent() == 1 && anIds(1).size() == 2 ) {
SVTK_IndexedMapOfIds anIds;
mySelector->GetCompositeIndex(anIO,anIds);
if( anIds.Extent() == 1 && anIds(1).size() == 2 ) {
- anId1 = anIds(1)[0];
- anId2 = anIds(1)[1];
- valid = true;
+
anId1 = anIds(1)[0];
+
anId2 = anIds(1)[1];
+
valid = true;
}
}
-
+
if( valid &&
findTriangles( aMesh->FindNode( anId1 ), aMesh->FindNode( anId2 ), tria[0],tria[1] ) )
{
QString aText = QString("%1-%2").arg(anId1).arg(anId2);
myEdge->setText(aText);
if( valid &&
findTriangles( aMesh->FindNode( anId1 ), aMesh->FindNode( anId2 ), tria[0],tria[1] ) )
{
QString aText = QString("%1-%2").arg(anId1).arg(anId2);
myEdge->setText(aText);
-
+
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
}
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
}
@@
-439,7
+439,7
@@
void SMESHGUI_SingleEditDlg::onSelectionDone()
//=======================================================================
// name : onDeactivate()
//=======================================================================
// name : onDeactivate()
-// Purpose : SLOT called when dialog must be deativated
+// Purpose : SLOT called when dialog must be dea
c
tivated
//=======================================================================
void SMESHGUI_SingleEditDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_SingleEditDlg::onDeactivate()
{
@@
-560,7
+560,7
@@
SMESHGUI_TrianglesInversionDlg
: SMESHGUI_SingleEditDlg(theModule)
{
setWindowTitle(tr("CAPTION"));
: SMESHGUI_SingleEditDlg(theModule)
{
setWindowTitle(tr("CAPTION"));
- myHelpFileName = "diagonal_inversion_of_elements
_page
.html";
+ myHelpFileName = "diagonal_inversion_of_elements.html";
}
SMESHGUI_TrianglesInversionDlg::~SMESHGUI_TrianglesInversionDlg()
}
SMESHGUI_TrianglesInversionDlg::~SMESHGUI_TrianglesInversionDlg()
@@
-584,7
+584,7
@@
SMESHGUI_UnionOfTwoTrianglesDlg
: SMESHGUI_SingleEditDlg(theModule)
{
setWindowTitle(tr("CAPTION"));
: SMESHGUI_SingleEditDlg(theModule)
{
setWindowTitle(tr("CAPTION"));
- myHelpFileName = "uniting_two_triangles
_page
.html";
+ myHelpFileName = "uniting_two_triangles.html";
}
SMESHGUI_UnionOfTwoTrianglesDlg::~SMESHGUI_UnionOfTwoTrianglesDlg()
}
SMESHGUI_UnionOfTwoTrianglesDlg::~SMESHGUI_UnionOfTwoTrianglesDlg()