mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-13 18:20:34 +05:00
0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge nodes" in manual mode
This commit is contained in:
parent
1c75225c81
commit
a13c835567
@ -835,6 +835,7 @@ void SMESHGUI_MergeDlg::onDetect()
|
||||
|
||||
ListCoincident->selectAll();
|
||||
updateControls();
|
||||
SMESH::UpdateView();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -845,6 +846,10 @@ void SMESHGUI_MergeDlg::onSelectGroup()
|
||||
{
|
||||
if (myIsBusy || !myActor)
|
||||
return;
|
||||
|
||||
if( ListCoincident->count() != ListCoincident->selectedItems().count() )
|
||||
SelectAllCB->setChecked( false );
|
||||
|
||||
myEditCurrentArgument = (QWidget*)ListCoincident;
|
||||
|
||||
myIsBusy = true;
|
||||
@ -994,6 +999,11 @@ void SMESHGUI_MergeDlg::onRemoveGroup()
|
||||
updateControls();
|
||||
SMESH::UpdateView();
|
||||
myIsBusy = false;
|
||||
|
||||
if( ListCoincident->count() == 0 ) {
|
||||
myEditCurrentArgument = (QWidget*)LineEditMesh;
|
||||
SelectAllCB->setChecked( false );
|
||||
}
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -1050,6 +1060,11 @@ void SMESHGUI_MergeDlg::onRemoveElement()
|
||||
|
||||
myIsBusy = false;
|
||||
onEditGroup();
|
||||
|
||||
if( ListCoincident->count() == 0 ) {
|
||||
myEditCurrentArgument = (QWidget*)LineEditMesh;
|
||||
SelectAllCB->setChecked( false );
|
||||
}
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -1294,12 +1309,14 @@ void SMESHGUI_MergeDlg::onTypeChanged (int id)
|
||||
GroupCoincidentWidget->show();
|
||||
SMESH::SetPointRepresentation(true);
|
||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||
aViewWindow->SetSelectionMode(NodeSelection);
|
||||
if( mySelector->IsSelectionEnabled() )
|
||||
aViewWindow->SetSelectionMode(NodeSelection);
|
||||
}
|
||||
else {
|
||||
GroupCoincident->show();
|
||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||
aViewWindow->SetSelectionMode(CellSelection);
|
||||
if( mySelector->IsSelectionEnabled() )
|
||||
aViewWindow->SetSelectionMode(CellSelection);
|
||||
}
|
||||
GroupEdit->show();
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user