From c56eb6b1a6a6a6ff812b5f818aea4836412e68b4 Mon Sep 17 00:00:00 2001 From: nds Date: Sat, 14 Dec 2019 09:25:48 +0300 Subject: [PATCH] 0031221: Visualization - selection filter in context --- src/AIS/AIS_Selection.cxx | 2 +- src/SelectMgr/SelectMgr_AndFilter.hxx | 6 +++--- src/SelectMgr/SelectMgr_Filter.hxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx index 8569e8a2b7..b5eeb8c09f 100644 --- a/src/AIS/AIS_Selection.cxx +++ b/src/AIS/AIS_Selection.cxx @@ -180,7 +180,7 @@ AIS_SelectStatus AIS_Selection::selectOwner (const Handle(SelectMgr_EntityOwner) const int theSelScheme, 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 (theSelScheme & AIS_SelectionScheme_Add) diff --git a/src/SelectMgr/SelectMgr_AndFilter.hxx b/src/SelectMgr/SelectMgr_AndFilter.hxx index 5406056738..8b106746c3 100644 --- a/src/SelectMgr/SelectMgr_AndFilter.hxx +++ b/src/SelectMgr/SelectMgr_AndFilter.hxx @@ -40,11 +40,11 @@ public: //! more types of entity. Standard_EXPORT SelectMgr_AndFilter(); - Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const Standard_OVERRIDE - { return Standard_False; } + Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj) const Standard_OVERRIDE + { (void)theObj; return Standard_False; } Standard_EXPORT virtual Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj, - const SelectMgr_FilterReaction& theReaction) const; + const SelectMgr_FilterReaction& theReaction) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter) diff --git a/src/SelectMgr/SelectMgr_Filter.hxx b/src/SelectMgr/SelectMgr_Filter.hxx index be2a82bf0d..8fdc714bb3 100644 --- a/src/SelectMgr/SelectMgr_Filter.hxx +++ b/src/SelectMgr/SelectMgr_Filter.hxx @@ -76,8 +76,8 @@ public: //! an AIS local context, you will need to implement the //! virtual function ActsOn. Standard_EXPORT virtual Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj, - const SelectMgr_FilterReaction& theReaction) - { return IsOk (theObj); } + const SelectMgr_FilterReaction& theReaction) const + { (void)theReaction; return IsOk (theObj); } //! Returns true in an AIS local context, if this filter //! operates on a type of subshape defined in a filter -- 2.39.5