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_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
0de973f
..
ee532a7
--- 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
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
@@
-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);
@@
-493,7
+493,7
@@
void SMESHGUI_SingleEditDlg::enterEvent (QEvent*)
//=================================================================================
bool SMESHGUI_SingleEditDlg::onApply()
{
//=================================================================================
bool SMESHGUI_SingleEditDlg::onApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
// verify validity of input data
if (!isValid(true))
return false;
// verify validity of input data
if (!isValid(true))
@@
-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()