mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-01 04:10:33 +05:00
PAL11428. fix selection mode storage/restoration
This commit is contained in:
parent
6e2ea154e8
commit
09762cc854
@ -80,6 +80,9 @@ SMESHGUI_SelectionOp::~SMESHGUI_SelectionOp()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void SMESHGUI_SelectionOp::startOperation()
|
void SMESHGUI_SelectionOp::startOperation()
|
||||||
{
|
{
|
||||||
|
myOldSelectionMode = selectionMode();
|
||||||
|
setSelectionMode( myDefSelectionMode );
|
||||||
|
|
||||||
SMESHGUI_Operation::startOperation();
|
SMESHGUI_Operation::startOperation();
|
||||||
if( dlg() )
|
if( dlg() )
|
||||||
{
|
{
|
||||||
@ -90,9 +93,6 @@ void SMESHGUI_SelectionOp::startOperation()
|
|||||||
connect( dlg(), SIGNAL( objectDeactivated( int ) ), this, SLOT( onDeactivateObject( int ) ) );
|
connect( dlg(), SIGNAL( objectDeactivated( int ) ), this, SLOT( onDeactivateObject( int ) ) );
|
||||||
connect( dlg(), SIGNAL( selectionChanged( int ) ), this, SLOT( onSelectionChanged( int ) ) );
|
connect( dlg(), SIGNAL( selectionChanged( int ) ), this, SLOT( onSelectionChanged( int ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
myOldSelectionMode = selectionMode();
|
|
||||||
setSelectionMode( myDefSelectionMode );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
@ -118,9 +118,9 @@ void SMESHGUI_SelectionOp::removeCustomFilters() const
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void SMESHGUI_SelectionOp::commitOperation()
|
void SMESHGUI_SelectionOp::commitOperation()
|
||||||
{
|
{
|
||||||
|
SMESHGUI_Operation::commitOperation();
|
||||||
removeCustomFilters();
|
removeCustomFilters();
|
||||||
setSelectionMode( myOldSelectionMode );
|
setSelectionMode( myOldSelectionMode );
|
||||||
SMESHGUI_Operation::commitOperation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
@ -129,9 +129,9 @@ void SMESHGUI_SelectionOp::commitOperation()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void SMESHGUI_SelectionOp::abortOperation()
|
void SMESHGUI_SelectionOp::abortOperation()
|
||||||
{
|
{
|
||||||
|
SMESHGUI_Operation::abortOperation();
|
||||||
removeCustomFilters();
|
removeCustomFilters();
|
||||||
setSelectionMode( myOldSelectionMode );
|
setSelectionMode( myOldSelectionMode );
|
||||||
SMESHGUI_Operation::abortOperation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user