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_CreatePolyhedralVolumeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index bdbb2d95da478b1c3b6f1a179cdec60f7013fe8e..faffadb33d74cbb9bfb8a8d1623770253316f581 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
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
@@
-302,7
+302,7
@@
SMESHGUI_CreatePolyhedralVolumeDlg::SMESHGUI_CreatePolyhedralVolumeDlg( SMESHGUI
mySMESHGUI->SetActiveDialogBox( (QDialog*)this );
mySMESHGUI->SetActiveDialogBox( (QDialog*)this );
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_polyhedrons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-polyhedrons-
anchor";
Init();
}
Init();
}
@@
-448,7
+448,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::ClickOnApply()
if( !isValid() )
return;
if( !isValid() )
return;
- if ( myNbOkElements>0 && !
mySMESHGUI->isActive
StudyLocked())
+ if ( myNbOkElements>0 && !
SMESHGUI::is
StudyLocked())
{
if(checkEditLine(false) == -1) {return;}
busy = true;
{
if(checkEditLine(false) == -1) {return;}
busy = true;
@@
-717,7
+717,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::onTextChange(const QString& theNewText)
buttonOk->setEnabled( false );
buttonApply->setEnabled( false );
buttonOk->setEnabled( false );
buttonApply->setEnabled( false );
- // check entered ids of faces and hilight them
+ // check entered ids of faces and hi
gh
light them
QStringList aListId;
if ( aMesh ) {
TColStd_MapOfInteger newIndices;
QStringList aListId;
if ( aMesh ) {
TColStd_MapOfInteger newIndices;