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
fix selection by id entering, fix shape dim definition
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DeleteGroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 838f50877aa42c23aa8f3d9f8ddb43de2af7dc4f..90f42d96ab702073ce87a1f798e7d30781dd10db 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@
-36,7
+36,7
@@
#include "SUIT_Desktop.h"
#include "SalomeApp_Study.h"
#include "SUIT_Desktop.h"
#include "SalomeApp_Study.h"
-#include "
Salome
App_SelectionMgr.h"
+#include "
Light
App_SelectionMgr.h"
#include "SALOME_ListIO.hxx"
#include "SALOME_ListIteratorOfListIO.hxx"
#include "SALOME_ListIO.hxx"
#include "SALOME_ListIteratorOfListIO.hxx"
@@
-76,7
+76,6
@@
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
- myViewWindow(SMESH::GetViewWindow(mySMESHGUI)),
mySMESHGUI(theModule)
{
setCaption(tr("CAPTION"));
mySMESHGUI(theModule)
{
setCaption(tr("CAPTION"));
@@
-170,7
+169,8
@@
void SMESHGUI_DeleteGroupDlg::Init ()
// set selection mode
mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
// set selection mode
mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
onSelectionDone();
return;
onSelectionDone();
return;
@@
-235,7
+235,8
@@
void SMESHGUI_DeleteGroupDlg::onOk()
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onClose()
{
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onClose()
{
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
@@
-289,7
+290,8
@@
void SMESHGUI_DeleteGroupDlg::enterEvent (QEvent*)
{
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
{
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
}
mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
}