ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-12 15:57:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix bug 10073. Check isVisible() in enterEvent() which unexpectedly comes after accept()

Browse Source
This commit is contained in:
eap 2005-12-19 13:14:02 +00:00
parent aeef41e893
commit dcc030258b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
View File

@ -389,8 +389,7 @@ void SMESHGUI_CreatePatternDlg::onSave()
//SUIT_Application::getDesktop()->setSelectionModes(ActorSelection); //SUIT_Application::getDesktop()->setSelectionModes(ActorSelection);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection); aViewWindow->SetSelectionMode(ActorSelection);
//disconnect(mySelectionMgr, 0, this, 0); disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(onSelectionDone()));
disconnect(mySMESHGUI, 0, this, 0); disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState(); mySMESHGUI->ResetState();
accept(); accept();
@ -582,10 +581,13 @@ void SMESHGUI_CreatePatternDlg::onDeactivate()
//======================================================================= //=======================================================================
void SMESHGUI_CreatePatternDlg::enterEvent (QEvent*) void SMESHGUI_CreatePatternDlg::enterEvent (QEvent*)
{ {
mySMESHGUI->EmitSignalDeactivateDialog(); // there is a stange problem that enterEvent() comes after onSave()
setEnabled(true); if ( isVisible () ) {
activateSelection(); mySMESHGUI->EmitSignalDeactivateDialog();
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone())); setEnabled(true);
activateSelection();
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
}
} }
//================================================================================= //=================================================================================