Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 12/04/2013
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MultiEditDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 83140402fee720916652e35ec0d52f68d92440a3..06d98f6c2287da366f6cfc65188b930c19bb4145 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@
-607,7
+607,9
@@
void SMESHGUI_MultiEditDlg::onSelectionDone()
anItem->setSelected(true);
}
}
anItem->setSelected(true);
}
}
- myMesh = SMESH::GetMeshByIO(anIO);
+ SMESH::SMESH_Mesh_var aSelMesh = SMESH::GetMeshByIO(anIO);
+ if (!aSelMesh->_is_nil())
+ myMesh = aSelMesh;
}
if (nbSel > 0) {
}
if (nbSel > 0) {
@@
-662,6
+664,7
@@
void SMESHGUI_MultiEditDlg::onFilterBtn()
myFilterDlg->SetSelection();
myFilterDlg->SetMesh(myMesh);
myFilterDlg->SetSelection();
myFilterDlg->SetMesh(myMesh);
+ myFilterDlg->SetSourceWg(myListBox, false);
myFilterDlg->show();
}
myFilterDlg->show();
}
@@
-975,7
+978,7
@@
void SMESHGUI_MultiEditDlg::setSelectionMode()
{
SMESH::RemoveFilters();
{
SMESH::RemoveFilters();
- mySelectionMgr->clearSelected();
+
//
mySelectionMgr->clearSelected();
mySelectionMgr->clearFilters();
if (mySubmeshChk->isChecked()) {
mySelectionMgr->clearFilters();
if (mySubmeshChk->isChecked()) {