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
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RemoveElementsDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
index 1ebfd06227d4aeace34ea6495fa66f0c7e473292..acdc3c8861d3638315cefc8f8eaf86163baeee0c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
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
@@
-42,6
+42,7
@@
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
@@
-161,7
+162,7
@@
SMESHGUI_RemoveElementsDlg
SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupC1);
SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupButtons);
SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupC1);
SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupButtons);
- myHelpFileName = "removing_nodes_and_elements
_page.html#removing_elements_
anchor";
+ myHelpFileName = "removing_nodes_and_elements
.html#removing-elements-
anchor";
Init(); /* Initialisations */
}
Init(); /* Initialisations */
}
@@
-222,18
+223,22
@@
void SMESHGUI_RemoveElementsDlg::Init()
//=================================================================================
void SMESHGUI_RemoveElementsDlg::ClickOnApply()
{
//=================================================================================
void SMESHGUI_RemoveElementsDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return;
return;
- if (myNbOkElements) {
+ if (myNbOkElements)
+ {
+ SUIT_OverrideCursor wc;
+
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
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();
bool aResult = false;
anArrayOfIdeces->length(aListId.count());
for (int i = 0; i < aListId.count(); i++)
anArrayOfIdeces[i] = aListId[ i ].toInt();
bool aResult = false;
- try {
+ try
+ {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
aResult = aMeshEditor->RemoveElements(anArrayOfIdeces.in());
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
aResult = aMeshEditor->RemoveElements(anArrayOfIdeces.in());
@@
-242,15
+247,13
@@
void SMESHGUI_RemoveElementsDlg::ClickOnApply()
} catch (const SALOME::SALOME_Exception& S_ex) {
SalomeApp_Tools::QtCatchCorbaException(S_ex);
} catch (const SALOME::SALOME_Exception& S_ex) {
SalomeApp_Tools::QtCatchCorbaException(S_ex);
- myEditCurrentArgument->clear();
- } catch (...){
- myEditCurrentArgument->clear();
+ } catch (...) {
}
}
+ myEditCurrentArgument->clear();
if (aResult) {
if (aResult) {
- myEditCurrentArgument->clear();
mySelector->ClearIndex();
mySelector->ClearIndex();
- SMESH::UpdateView();
+ SMESH::UpdateView(
/*withChildrenOfSelected=*/true
);
SMESHGUI::Modified();
}
}
SMESHGUI::Modified();
}
}
@@
-340,12
+343,12
@@
void SMESHGUI_RemoveElementsDlg::onTextChange(const QString& theNewText)
myNbOkElements = 0;
myNbOkElements = 0;
- // hilight entered elements
+ // hi
gh
light entered elements
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++) {