From 16ed45cd7d75a5763214f0a4aa8e806923852ba6 Mon Sep 17 00:00:00 2001 From: akl Date: Thu, 4 Apr 2013 08:47:29 +0000 Subject: [PATCH] Fix of INT PAL 0022077: TC5.1.5: usage of filters in Modification dialogs, Add button. 1) Don't clear selection at open of dialog; 2) Disable automatic insert of selected elements in the list box; 3) Don't clear mesh selection during geometry selection. --- src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index b16161478..381cecf64 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -607,7 +607,9 @@ void SMESHGUI_MultiEditDlg::onSelectionDone() anItem->setSelected(true); } } - myMesh = SMESH::GetMeshByIO(anIO); + SMESH::SMESH_Mesh_var aSelMesh = SMESH::GetMeshByIO(anIO); + if (!aSelMesh->_is_nil()) + myMesh = aSelMesh; } if (nbSel > 0) { @@ -662,7 +664,7 @@ void SMESHGUI_MultiEditDlg::onFilterBtn() myFilterDlg->SetSelection(); myFilterDlg->SetMesh(myMesh); - myFilterDlg->SetSourceWg(myListBox); + myFilterDlg->SetSourceWg(myListBox, false); myFilterDlg->show(); } @@ -976,7 +978,7 @@ void SMESHGUI_MultiEditDlg::setSelectionMode() { SMESH::RemoveFilters(); - mySelectionMgr->clearSelected(); + // mySelectionMgr->clearSelected(); mySelectionMgr->clearFilters(); if (mySubmeshChk->isChecked()) {