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
Gestion des erreurs de données
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DeleteGroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 3200bc02f881d1fac7190cbd66d8ca65a0b20d47..093ab1075c61658676b99f1ef35d31a5641b413e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,13
+37,13
@@
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
+#include <SUIT_OverrideCursor.h>
#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_Selection.h>
#include <SVTK_ViewWindow.h>
#include <SVTK_Selection.h>
#include <SVTK_ViewWindow.h>
@@
-74,8
+74,8
@@
//=================================================================================
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
QDialog(SMESH::GetDesktop(theModule)),
//=================================================================================
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
QDialog(SMESH::GetDesktop(theModule)),
- myS
electionMgr(SMESH::GetSelectionMgr(theModule)
),
- myS
MESHGUI(theModule
)
+ myS
MESHGUI(theModule
),
+ myS
electionMgr(SMESH::GetSelectionMgr(theModule)
)
{
setModal(false);
setWindowTitle(tr("CAPTION"));
{
setModal(false);
setWindowTitle(tr("CAPTION"));
@@
-90,7
+90,7
@@
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
aDlgLay->addWidget(aMainFrame);
aDlgLay->addWidget(aBtnFrame);
aDlgLay->addWidget(aMainFrame);
aDlgLay->addWidget(aBtnFrame);
- myHelpFileName = "deleting_groups
_page
.html";
+ myHelpFileName = "deleting_groups.html";
Init();
}
Init();
}
@@
-194,7
+194,7
@@
bool SMESHGUI_DeleteGroupDlg::isValid()
return false;
}
return false;
}
- return !
mySMESHGUI->isActive
StudyLocked();
+ return !
SMESHGUI::is
StudyLocked();
}
//=================================================================================
}
//=================================================================================
@@
-206,6
+206,8
@@
bool SMESHGUI_DeleteGroupDlg::onApply()
if (!isValid())
return false;
if (!isValid())
return false;
+ SUIT_OverrideCursor wc;
+
myBlockSelection = true;
QList<SMESH::SMESH_GroupBase_var>::iterator anIter;
myBlockSelection = true;
QList<SMESH::SMESH_GroupBase_var>::iterator anIter;
@@
-248,12
+250,16
@@
void SMESHGUI_DeleteGroupDlg::onOk()
//=================================================================================
void SMESHGUI_DeleteGroupDlg::reject()
{
//=================================================================================
void SMESHGUI_DeleteGroupDlg::reject()
{
+ if (SMESH::GetCurrentVtkView()) {
+ SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
+ }
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
disconnect(mySelectionMgr, 0, this, 0);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
disconnect(mySelectionMgr, 0, this, 0);
- disconnect(mySMESHGUI, 0, this, 0);
- mySMESHGUI->ResetState();
+
//
disconnect(mySMESHGUI, 0, this, 0);
+
//
mySMESHGUI->ResetState();
mySelectionMgr->clearFilters();
mySelectionMgr->clearFilters();
+ mySMESHGUI->ResetState();
QDialog::reject();
}
QDialog::reject();
}
@@
-313,7
+319,7
@@
void SMESHGUI_DeleteGroupDlg::onSelectionDone()
//=================================================================================
// function : onDeactivate()
//=================================================================================
// function : onDeactivate()
-// purpose : SLOT called when dialog must be deativated
+// purpose : SLOT called when dialog must be dea
c
tivated
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onDeactivate()
{
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onDeactivate()
{