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 branch 'origin/V7_dev'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RemoveElementsDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
index 1decdeff61f3cad222877bc3958701877badba6f..067eb5f49e734f6c2d48e900f21e4fcb784dbbd3 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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>
@@
-80,8
+81,8
@@
SMESHGUI_RemoveElementsDlg
::SMESHGUI_RemoveElementsDlg(SMESHGUI* theModule)
: QDialog(SMESH::GetDesktop(theModule)),
SMESHGUI_RemoveElementsDlg
::SMESHGUI_RemoveElementsDlg(SMESHGUI* theModule)
: QDialog(SMESH::GetDesktop(theModule)),
- mySelector(SMESH::GetViewWindow(theModule)->GetSelector()),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
+ mySelector(SMESH::GetViewWindow(theModule)->GetSelector()),
mySMESHGUI(theModule),
myBusy(false),
myFilterDlg(0)
mySMESHGUI(theModule),
myBusy(false),
myFilterDlg(0)
@@
-225,7
+226,10
@@
void SMESHGUI_RemoveElementsDlg::ClickOnApply()
if (mySMESHGUI->isActiveStudyLocked())
return;
if (mySMESHGUI->isActiveStudyLocked())
return;
- if (myNbOkElements) {
+ if (myNbOkElements)
+ {
+ SUIT_OverrideCursor wc;
+
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
anArrayOfIdeces->length(aListId.count());
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
anArrayOfIdeces->length(aListId.count());
@@
-233,7
+237,8
@@
void SMESHGUI_RemoveElementsDlg::ClickOnApply()
anArrayOfIdeces[i] = aListId[ i ].toInt();
bool aResult = false;
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());
@@
-377,7
+382,7
@@
void SMESHGUI_RemoveElementsDlg::onTextChange(const QString& theNewText)
void SMESHGUI_RemoveElementsDlg::SelectionIntoArgument()
{
if (myBusy) return; // busy
void SMESHGUI_RemoveElementsDlg::SelectionIntoArgument()
{
if (myBusy) return; // busy
- if (myFilterDlg && myFilterDlg->isVisible()) return; // filter d
igl
active
+ if (myFilterDlg && myFilterDlg->isVisible()) return; // filter d
lg
active
if (!GroupButtons->isEnabled()) return; // inactive
// clear
if (!GroupButtons->isEnabled()) return; // inactive
// clear