From c0428e70cfcbc5c2be712fe2bb898988559b9353 Mon Sep 17 00:00:00 2001 From: kgv Date: Fri, 11 Feb 2022 15:29:35 +0300 Subject: [PATCH] 0032829: Visualization - dynamic highlight results are not cleared by AIS_InteractiveContext::Redisplay() AIS_InteractiveContext::RecomputeSelectionOnly() now removes old Owners of recomputed object from selection results. vdisplay command now resets AIS_ViewController::ResetPreviousMoveTo() cache. --- src/AIS/AIS_InteractiveContext.cxx | 14 ++++++++++++-- src/AIS/AIS_InteractiveContext.hxx | 4 +++- src/ViewerTest/ViewerTest.cxx | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 030fd67623..67e4bed881 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -956,9 +956,19 @@ void AIS_InteractiveContext::RecomputeSelectionOnly(const Handle(AIS_Interactive mgrSelector->Deactivate(theIO, aModesIter.Value()); } - mgrSelector->RecomputeSelection(theIO); - const Handle(AIS_GlobalStatus)* aStatus = myObjects.Seek(theIO); + if (aStatus != NULL) + { + if (!myLastPicked.IsNull() && myLastPicked->IsSameSelectable(theIO)) + { + clearDynamicHighlight(); + myLastPicked.Nullify(); + } + + unselectOwners(theIO); + } + + mgrSelector->RecomputeSelection(theIO); if (aStatus == NULL || theIO->DisplayStatus() != PrsMgr_DisplayStatus_Displayed) { return; diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx index e3194bdebd..c2aab708d5 100644 --- a/src/AIS/AIS_InteractiveContext.hxx +++ b/src/AIS/AIS_InteractiveContext.hxx @@ -163,6 +163,7 @@ public: //! @name object display management Standard_EXPORT void RemoveAll(const Standard_Boolean theToUpdateViewer); //! Recomputes the seen parts presentation of the Object. + //! The object will be also unhighlighted and removed from selection. //! If theAllModes equals true, all presentations are present in the object even if unseen. Standard_EXPORT void Redisplay(const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theToUpdateViewer, @@ -175,13 +176,14 @@ public: //! @name object display management const Standard_Boolean theToUpdateViewer); //! Recomputes the displayed presentations, flags the others. - //! Doesn't update presentations. + //! Doesn't update selections. Standard_EXPORT void RecomputePrsOnly(const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theToUpdateViewer, const Standard_Boolean theAllModes = Standard_False); //! Recomputes the active selections, flags the others. //! Doesn't update presentations. + //! The object will be also unhighlighted and removed from selection. Standard_EXPORT void RecomputeSelectionOnly(const Handle(AIS_InteractiveObject)& anIObj); //! Updates displayed interactive object by checking and recomputing its flagged as "to be diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx index 705939d645..fe5917b4e6 100644 --- a/src/ViewerTest/ViewerTest.cxx +++ b/src/ViewerTest/ViewerTest.cxx @@ -5193,6 +5193,8 @@ static int VDisplay2(Draw_Interpretor& theDI, Standard_Integer theArgNb, const c } } + // invalidate picking cache + ViewerTest::CurrentEventManager()->ResetPreviousMoveTo(); return 0; }