From 14c4193d11357ed0dff5aabc51106dea94c368c5 Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 11 Apr 2017 10:25:21 +0300 Subject: [PATCH] 0028390: Visualization, AIS_InteractiveContext - add topmost-only picking strategy AIS_InteractiveContext::PickingStrategy(), added new property defining picking strategy SelectMgr_PickingStrategy. Strategy SelectMgr_PickingStrategy_OnlyTopmost allows picking only topmost detected entity not rejected by Selection Filters. --- src/AIS/AIS_InteractiveContext.cxx | 1 + src/AIS/AIS_InteractiveContext.hxx | 73 ++++++++++++-------- src/AIS/AIS_InteractiveContext_1.cxx | 8 ++- src/SelectMgr/FILES | 1 + src/SelectMgr/SelectMgr_PickingStrategy.hxx | 24 +++++++ src/ViewerTest/ViewerTest_ViewerCommands.cxx | 34 +++++++++ tests/v3d/face/F3 | 26 +++++++ 7 files changed, 137 insertions(+), 30 deletions(-) create mode 100644 src/SelectMgr/SelectMgr_PickingStrategy.hxx create mode 100644 tests/v3d/face/F3 diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index ac91d366bb..c60b74fe87 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -119,6 +119,7 @@ myDefaultDrawer(new Prs3d_Drawer()), myCurLocalIndex(0), myCurDetected(0), myCurHighlighted(0), +myPickingStrategy (SelectMgr_PickingStrategy_FirstAcceptable), myIsAutoActivateSelMode(Standard_True) { myStyles[Prs3d_TypeOfHighlight_None] = myDefaultDrawer; diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx index ca775d87a6..7a55ce726b 100644 --- a/src/AIS/AIS_InteractiveContext.hxx +++ b/src/AIS/AIS_InteractiveContext.hxx @@ -17,38 +17,34 @@ #ifndef _AIS_InteractiveContext_HeaderFile #define _AIS_InteractiveContext_HeaderFile -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + class SelectMgr_SelectionManager; class V3d_Viewer; class AIS_InteractiveObject; @@ -56,12 +52,10 @@ class SelectMgr_OrFilter; class V3d_View; class AIS_LocalContext; class TopLoc_Location; -class Quantity_Color; class TCollection_ExtendedString; class Prs3d_LineAspect; class Prs3d_BasicAspect; class SelectMgr_EntityOwner; -class Standard_Transient; class SelectMgr_Filter; class TCollection_AsciiString; @@ -144,6 +138,26 @@ public: Standard_EXPORT Standard_Boolean GetAutoActivateSelection() const; + //! Setup picking strategy - which entities detected by picking line will be accepted, considering Selection Filters. + //! By default (SelectMgr_PickingStrategy_FirstAcceptable), Selection Filters reduce the list of entities + //! so that the context accepts topmost in remaining. + //! + //! This means that entities behind non-selectable (by filters) parts can be picked by user. + //! If this behavior is undesirable, and user wants that non-selectable (by filters) parts + //! should remain an obstacle for picking, SelectMgr_PickingStrategy_OnlyTopmost can be set instead. + //! + //! Notice, that since Selection Manager operates only objects registered in it, + //! SelectMgr_PickingStrategy_OnlyTopmost will NOT prevent picking entities behind + //! visible by unregistered in Selection Manager presentations (e.g. deactivated). + //! Hence, SelectMgr_PickingStrategy_OnlyTopmost changes behavior only with Selection Filters enabled. + void SetPickingStrategy (const SelectMgr_PickingStrategy theStrategy) + { + myPickingStrategy = theStrategy; + } + + //! Return picking strategy; SelectMgr_PickingStrategy_FirstAcceptable by default. + SelectMgr_PickingStrategy PickingStrategy() const { return myPickingStrategy; } + //! Controls the choice between the using the display //! and selection modes of open local context which you //! have defined and activating those available by default. @@ -1864,6 +1878,7 @@ protected: TColStd_SequenceOfInteger myDetectedSeq; Standard_Integer myCurDetected; Standard_Integer myCurHighlighted; + SelectMgr_PickingStrategy myPickingStrategy; //!< picking strategy to be applied within MoveTo() Standard_Boolean myIsAutoActivateSelMode; }; diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx index 0c181b46b5..eced2f01fd 100644 --- a/src/AIS/AIS_InteractiveContext_1.cxx +++ b/src/AIS/AIS_InteractiveContext_1.cxx @@ -331,16 +331,22 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th // (the objects must be AIS_Shapes) const Standard_Integer aDetectedNb = myMainSel->NbPicked(); Standard_Integer aNewDetected = 0; + Standard_Boolean toIgnoreDetTop = Standard_False; for (Standard_Integer aDetIter = 1; aDetIter <= aDetectedNb; ++aDetIter) { Handle(SelectMgr_EntityOwner) anOwner = myMainSel->Picked (aDetIter); if (anOwner.IsNull() || !myFilters->IsOk (anOwner)) { + if (myPickingStrategy == SelectMgr_PickingStrategy_OnlyTopmost) + { + toIgnoreDetTop = Standard_True; + } continue; } - if (aNewDetected < 1) + if (aNewDetected < 1 + && !toIgnoreDetTop) { aNewDetected = aDetIter; } diff --git a/src/SelectMgr/FILES b/src/SelectMgr/FILES index b01ff670af..943b815c84 100755 --- a/src/SelectMgr/FILES +++ b/src/SelectMgr/FILES @@ -21,6 +21,7 @@ SelectMgr_ListIteratorOfListOfFilter.hxx SelectMgr_ListOfFilter.hxx SelectMgr_OrFilter.cxx SelectMgr_OrFilter.hxx +SelectMgr_PickingStrategy.hxx SelectMgr_RectangularFrustum.cxx SelectMgr_RectangularFrustum.hxx SelectMgr_SelectableObject.cxx diff --git a/src/SelectMgr/SelectMgr_PickingStrategy.hxx b/src/SelectMgr/SelectMgr_PickingStrategy.hxx new file mode 100644 index 0000000000..303ce6e368 --- /dev/null +++ b/src/SelectMgr/SelectMgr_PickingStrategy.hxx @@ -0,0 +1,24 @@ +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _SelectMgr_PickingStrategy_HeaderFile +#define _SelectMgr_PickingStrategy_HeaderFile + +//! Enumeration defines picking strategy - which entities detected by picking line will be accepted, considering selection filters. +enum SelectMgr_PickingStrategy +{ + SelectMgr_PickingStrategy_FirstAcceptable, //!< the first detected entity passing selection filter is accepted (e.g. any) + SelectMgr_PickingStrategy_OnlyTopmost //!< only topmost detected entity passing selection filter is accepted +}; + +#endif // _SelectMgr_PickingStrategy_HeaderFile diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 4674f358b3..797d630342 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -10175,6 +10175,37 @@ static int VSelectionProperties (Draw_Interpretor& theDi, } aCtx->SetAutoActivateSelection (toEnable); } + else if (anArg == "-pickstrategy" + || anArg == "-pickingstrategy") + { + if (++anArgIter >= theArgsNb) + { + std::cout << "Syntax error: type of highlighting is undefined\n"; + return 1; + } + + SelectMgr_PickingStrategy aStrategy = SelectMgr_PickingStrategy_FirstAcceptable; + TCollection_AsciiString aVal (theArgVec[anArgIter]); + aVal.LowerCase(); + if (aVal == "first" + || aVal == "firstaccepted" + || aVal == "firstacceptable") + { + aStrategy = SelectMgr_PickingStrategy_FirstAcceptable; + } + else if (aVal == "topmost" + || aVal == "onlyTopmost") + { + aStrategy = SelectMgr_PickingStrategy_OnlyTopmost; + } + else + { + std::cout << "Syntax error: unknwon picking strategy '" << aVal << "'\n"; + return 1; + } + + aCtx->SetPickingStrategy (aStrategy); + } else if (anArg == "-pixtol" && anArgIter + 1 < theArgsNb) { @@ -11103,6 +11134,9 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) "\n vselprops [dynHighlight|localDynHighlight|selHighlight|localSelHighlight] [options]" "\n Customizes selection and dynamic highlight parameters for the whole interactive context:" "\n -autoActivate {0|1} : disables|enables default computation and activation of global selection mode" + "\n -pickStrategy {first|topmost} : defines picking strategy" + "\n 'first' to pick first acceptable (default)" + "\n 'topmost' to pick only topmost (and nothing, if topmost is rejected by filters)" "\n -pixTol value : sets up pixel tolerance" "\n -dispMode dispMode : sets display mode for highlighting" "\n -layer ZLayer : sets ZLayer for highlighting" diff --git a/tests/v3d/face/F3 b/tests/v3d/face/F3 new file mode 100644 index 0000000000..da5796176e --- /dev/null +++ b/tests/v3d/face/F3 @@ -0,0 +1,26 @@ +box b1 0 0 0 1 1 1 +box b2 2 0 0 1 1 1 +vclear +vinit View1 +vviewparams -scale 404 -proj 0.8 -0.16 0.5 -up -0.4 0.4 0.8 -at 1.5 0.5 0.5 +vsetfilter -clear +vselprops -pickStrategy first +vdisplay -dispMode 1 -highMode 1 b1 b2 +vfit + +vselmode b1 4 1 +vmoveto 220 220 +if { [vreadpixel 220 220 rgb name] != "TURQUOISE3" } { puts "Error: box b2 should be highlighted" } + +vsetfilter -type=FACE +vmoveto 0 0 +vmoveto 220 220 +if { [vreadpixel 150 150 rgb name] != "CYAN1" } { puts "Error: face of box b1 should be highlighted" } + +vselprops -pickStrategy topmost +vmoveto 0 0 +vmoveto 220 220 +if { [vreadpixel 150 150 rgb name] == "CYAN1" } { puts "Error: face of box b1 should NOT be highlighted" } + +vmoveto 150 150 +if { [vreadpixel 150 150 rgb name] != "CYAN1" } { puts "Error: face of box b1 should be highlighted" }