0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge nodes" in manual mode

This commit is contained in:
mpa 2014-04-25 10:52:26 +04:00
parent b1f58b701e
commit 1176e29a2c

View File

@ -682,6 +682,8 @@ bool SMESHGUI_MergeDlg::ClickOnApply()
ListCoincident->clear(); ListCoincident->clear();
myEditCurrentArgument = (QWidget*)LineEditMesh;
SMESH::UpdateView(); SMESH::UpdateView();
SMESHGUI::Modified(); SMESHGUI::Modified();
@ -1139,7 +1141,7 @@ void SMESHGUI_MergeDlg::SelectionIntoArgument()
if (!myActor) if (!myActor)
myActor = SMESH::FindActorByObject(myMesh); myActor = SMESH::FindActorByObject(myMesh);
if ( myActor && myTypeId ==1 ) { if ( myActor && myTypeId == 1 && mySelector->IsSelectionEnabled() ) {
mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil(); mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter); mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);