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
PAL8238
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 7c15603ed475c5a8a4d71d09d970e1891f1e0261..5cff77713d51db9abd158bd4c9a069f8f96a5293 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@
-68,9
+68,7
@@
SMESHGUI_GroupOpDlg::SMESHGUI_GroupOpDlg( SMESHGUI* theModule, const int theMode
: QDialog( SMESH::GetDesktop( theModule ), "SMESHGUI_GroupOpDlg", false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ),
mySMESHGUI( theModule ),
: QDialog( SMESH::GetDesktop( theModule ), "SMESHGUI_GroupOpDlg", false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ),
mySMESHGUI( theModule ),
- mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
- myViewWindow( SMESH::GetViewWindow( theModule ) ),
- mySelector( myViewWindow->GetSelector() )
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) )
{
myMode = theMode;
{
myMode = theMode;
@@
-78,6
+76,8
@@
SMESHGUI_GroupOpDlg::SMESHGUI_GroupOpDlg( SMESHGUI* theModule, const int theMode
else if (myMode == INTERSECT) setCaption(tr("INTERSECTION_OF_TWO_GROUPS"));
else setCaption(tr("CUT_OF_TWO_GROUPS"));
else if (myMode == INTERSECT) setCaption(tr("INTERSECTION_OF_TWO_GROUPS"));
else setCaption(tr("CUT_OF_TWO_GROUPS"));
+ mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
+
QVBoxLayout* aDlgLay = new QVBoxLayout (this, MARGIN, SPACING);
QFrame* aMainFrame = createMainFrame (this);
QVBoxLayout* aDlgLay = new QVBoxLayout (this, MARGIN, SPACING);
QFrame* aMainFrame = createMainFrame (this);
@@
-191,7
+191,8
@@
void SMESHGUI_GroupOpDlg::Init()
this->show();
// set selection mode
this->show();
// set selection mode
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
return;
mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
return;
@@
-284,7
+285,8
@@
void SMESHGUI_GroupOpDlg::onOk()
//=======================================================================
void SMESHGUI_GroupOpDlg::onClose()
{
//=======================================================================
void SMESHGUI_GroupOpDlg::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();
@@
-343,7
+345,8
@@
void SMESHGUI_GroupOpDlg::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));
}