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
Implementation of ExportMEDCoupling.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DeleteGroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 830fe1dcb4b4d4127a187e21648f85875394a902..c23328b7469d4a6fbabf579d74b431ec0ec1cf53 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
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
@@
-194,7
+194,7
@@
bool SMESHGUI_DeleteGroupDlg::isValid()
return false;
}
return false;
}
- return !
mySMESHGUI->isActive
StudyLocked();
+ return !
SMESHGUI::is
StudyLocked();
}
//=================================================================================
}
//=================================================================================
@@
-250,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();
}