ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-18 10:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups

Browse Source 
SetMesh() to the filter and not to the predicate
This commit is contained in:
eap 2011-10-24 13:13:13 +00:00
parent 8801aa27ed
commit 0ee1eb8432
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -2973,10 +2973,8 @@ void SMESHGUI_FilterDlg::SetMesh (SMESH::SMESH_Mesh_var theMesh)
{ {
if ( !theMesh->_is_nil() ) { if ( !theMesh->_is_nil() ) {
myMesh = theMesh; myMesh = theMesh;
if ( !myFilter[ myTable->GetType() ]->_is_nil() && !myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() ) { if ( !myFilter[ myTable->GetType() ]->_is_nil())
SMESH::Predicate_ptr aPred = myFilter[ myTable->GetType() ]->GetPredicate(); myFilter[ myTable->GetType() ]->SetMesh( theMesh );
aPred->SetMesh(myMesh);
}
} }
const bool isEnable = !(myMesh->_is_nil()); const bool isEnable = !(myMesh->_is_nil());
myButtons[BTN_OK]->setEnabled(isEnable); myButtons[BTN_OK]->setEnabled(isEnable);
@ -3176,7 +3174,6 @@ void SMESHGUI_FilterDlg::filterSource (const int theType,
// filter ids // filter ids
SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate(); SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate();
aPred->SetMesh(myMesh);
QList<int>::const_iterator anIter; QList<int>::const_iterator anIter;
for (anIter = aDialogIds.begin(); anIter != aDialogIds.end(); ++ anIter) for (anIter = aDialogIds.begin(); anIter != aDialogIds.end(); ++ anIter)
if (aPred->IsSatisfy(*anIter)) if (aPred->IsSatisfy(*anIter))
@ -3249,7 +3246,6 @@ void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
// Filter entities // Filter entities
SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate(); SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate();
aPred->SetMesh(myMesh);
TColStd_MapIteratorOfMapOfInteger aResIter(aToBeFiltered); TColStd_MapIteratorOfMapOfInteger aResIter(aToBeFiltered);
for ( ; aResIter.More(); aResIter.Next()) for ( ; aResIter.More(); aResIter.Next())
if (aPred->IsSatisfy(aResIter.Key())) if (aPred->IsSatisfy(aResIter.Key()))