mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-14 02:30:33 +05:00
Additional fix for issue 19928
This commit is contained in:
parent
b5b677e66c
commit
b746d8b4e2
@ -591,17 +591,6 @@ void SMESHGUI_ExtrusionDlg::ClickOnOk()
|
||||
//=================================================================================
|
||||
void SMESHGUI_ExtrusionDlg::ClickOnCancel()
|
||||
{
|
||||
disconnect(mySelectionMgr, 0, this, 0);
|
||||
mySelectionMgr->clearFilters();
|
||||
//mySelectionMgr->clearSelected();
|
||||
if (SMESH::GetCurrentVtkView()) {
|
||||
SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
|
||||
SMESH::SetPointRepresentation(false);
|
||||
SMESH::SetPickable();
|
||||
}
|
||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||
aViewWindow->SetSelectionMode(ActorSelection);
|
||||
mySMESHGUI->ResetState();
|
||||
reject();
|
||||
}
|
||||
|
||||
@ -883,6 +872,32 @@ void SMESHGUI_ExtrusionDlg::enterEvent (QEvent*)
|
||||
ActivateThisDialog();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : closeEvent()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void SMESHGUI_ExtrusionDlg::closeEvent( QCloseEvent* )
|
||||
{
|
||||
/* same than click on cancel button */
|
||||
disconnect(mySelectionMgr, 0, this, 0);
|
||||
mySelectionMgr->clearFilters();
|
||||
//mySelectionMgr->clearSelected();
|
||||
if (SMESH::GetCurrentVtkView()) {
|
||||
SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
|
||||
SMESH::SetPointRepresentation(false);
|
||||
SMESH::SetPickable();
|
||||
}
|
||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||
aViewWindow->SetSelectionMode(ActorSelection);
|
||||
mySMESHGUI->ResetState();
|
||||
}
|
||||
|
||||
void SMESHGUI_ExtrusionDlg::reject()
|
||||
{
|
||||
QDialog::reject();
|
||||
close();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : onSelectMesh()
|
||||
// purpose :
|
||||
|
@ -69,9 +69,12 @@ public:
|
||||
SMESHGUI_ExtrusionDlg( SMESHGUI* );
|
||||
~SMESHGUI_ExtrusionDlg();
|
||||
|
||||
void reject();
|
||||
|
||||
private:
|
||||
void Init( bool = true );
|
||||
void enterEvent( QEvent* ); /* mouse enter the QWidget */
|
||||
void closeEvent( QCloseEvent* );
|
||||
void keyPressEvent( QKeyEvent* );
|
||||
int GetConstructorId();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user