From: age Date: Tue, 24 Nov 2020 13:14:19 +0000 (+0300) Subject: 0030737: Visualization - implementing new selection schemes in context X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=8d45f552b7e2e3a111346e6c75c4f8745e4ecf40;p=occt-copy.git 0030737: Visualization - implementing new selection schemes in context Fixed selections filters --- diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx index 10b1410367..e310e8df96 100644 --- a/src/AIS/AIS_Selection.cxx +++ b/src/AIS/AIS_Selection.cxx @@ -183,7 +183,7 @@ void AIS_Selection::SelectOwners (const AIS_NListOfEntityOwner& thePickedOwners, const Handle(SelectMgr_EntityOwner)& anOwner = aSelIter.Value(); if (anOwner.IsNull() || !anOwner->HasSelectable() - || !theFilter->IsOk (anOwner)) + || !theFilter->IsOk (anOwner, SelectMgr_FilterReaction_Select)) { continue; } @@ -238,7 +238,7 @@ AIS_SelectStatus AIS_Selection::appendOwner (const Handle(SelectMgr_EntityOwner) { if (theOwner.IsNull() || !theOwner->HasSelectable() - || !theFilter->IsOk (theOwner)) + || !theFilter->IsOk (theOwner, SelectMgr_FilterReaction_Select)) { return AIS_SS_NotDone; } @@ -254,7 +254,7 @@ AIS_SelectStatus AIS_Selection::XOROwner (const Handle(SelectMgr_EntityOwner)& t const AIS_NListOfEntityOwner& thePreviousSelected, const Handle(SelectMgr_Filter)& theFilter) { - if (theOwner.IsNull() || !theOwner->HasSelectable() || !theFilter->IsOk (theOwner)) + if (theOwner.IsNull() || !theOwner->HasSelectable() || !theFilter->IsOk (theOwner, SelectMgr_FilterReaction_Select)) return AIS_SS_NotDone; if (thePreviousSelected.Contains (theOwner)) // was selected, should not be now