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 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RemoveNodesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
index 805b37c85a1eccabe0371eb783e6abea10295d11..5c0555d2b7e9371bc9b9c8054f5f0ef1ced1e1af 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-162,7
+162,7
@@
SMESHGUI_RemoveNodesDlg
SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupC1);
SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupButtons);
SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupC1);
SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupButtons);
- myHelpFileName = "removing_nodes_and_elements
_page.html#removing_nodes_
anchor";
+ myHelpFileName = "removing_nodes_and_elements
.html#removing-nodes-
anchor";
Init(); /* Initialisations */
}
Init(); /* Initialisations */
}
@@
-229,12
+229,12
@@
void SMESHGUI_RemoveNodesDlg::Init()
//=================================================================================
void SMESHGUI_RemoveNodesDlg::ClickOnApply()
{
//=================================================================================
void SMESHGUI_RemoveNodesDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return;
if (myNbOkNodes) {
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
return;
if (myNbOkNodes) {
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anArrayOfIdeces = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anArrayOfIdeces = new SMESH::smIdType
_array;
anArrayOfIdeces->length(aListId.count());
for (int i = 0; i < aListId.count(); i++)
anArrayOfIdeces[i] = aListId[ i ].toInt();
anArrayOfIdeces->length(aListId.count());
for (int i = 0; i < aListId.count(); i++)
anArrayOfIdeces[i] = aListId[ i ].toInt();
@@
-351,12
+351,12
@@
void SMESHGUI_RemoveNodesDlg::onTextChange(const QString& theNewText)
myNbOkNodes = 0;
myNbOkNodes = 0;
- // hilight entered nodes
+ // hi
gh
light entered nodes
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();
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
for (int i = 0; i < aListId.count(); i++) {
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
for (int i = 0; i < aListId.count(); i++) {