From: nds Date: Thu, 5 Dec 2019 14:15:09 +0000 (+0300) Subject: 0031197: Visualization - SetTransformPersistence for highlight, select presentations X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=33ffefa2f7c052225012dde159c5001a3cc73ea5;p=occt-copy.git 0031197: Visualization - SetTransformPersistence for highlight, select presentations (cherry picked from commit df3644aa354c932483d89f553b09a2f399135f0f) --- diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 5d4454d5e7..aef6de6533 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -2554,6 +2554,15 @@ void AIS_InteractiveContext::SetTransformPersistence (const Handle(AIS_Interacti const Handle(Graphic3d_TransformPers)& theTrsfPers) { theObject->SetTransformPersistence (theTrsfPers); + UpdateOnTransformPersistence (theObject); +} + +//======================================================================= +//function : UpdateOnTransformPersistence +//purpose : +//======================================================================= +void AIS_InteractiveContext::UpdateOnTransformPersistence (const Handle(AIS_InteractiveObject)& theObject) +{ if (!myObjects.IsBound (theObject)) { return; diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx index 0e1b56d8ff..bfb74eddd5 100644 --- a/src/AIS/AIS_InteractiveContext.hxx +++ b/src/AIS/AIS_InteractiveContext.hxx @@ -344,6 +344,11 @@ public: //! @name object local transformation management Standard_EXPORT void SetTransformPersistence (const Handle(AIS_InteractiveObject)& theObject, const Handle(Graphic3d_TransformPers)& theTrsfPers); + //! Updates displayed interactive object by checking and recomputing its flagged as "to be recomputed" presentation and selection structures. + //! This method does not force any recomputation on its own. + //! The method recomputes selections even if they are loaded without activation in particular selector. + Standard_EXPORT void UpdateOnTransformPersistence (const Handle(AIS_InteractiveObject)& theIObj); + Standard_DEPRECATED("This method is deprecated - SetTransformPersistence() taking Graphic3d_TransformPers should be called instead") void SetTransformPersistence (const Handle(AIS_InteractiveObject)& theObj, const Graphic3d_TransModeFlags& theFlag, diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx index 79139abe4d..52d203eb97 100644 --- a/src/AIS/AIS_InteractiveObject.cxx +++ b/src/AIS/AIS_InteractiveObject.cxx @@ -83,6 +83,17 @@ void AIS_InteractiveObject::SetContext (const Handle(AIS_InteractiveContext)& th } } +//----------------------------------------------------------------------------- +void AIS_InteractiveObject::SetTransformPersistence (const Handle(Graphic3d_TransformPers)& theTrsfPers) +{ + SelectMgr_SelectableObject::SetTransformPersistence (theTrsfPers); + + if (!GetContext().IsNull()) + { + GetContext()->UpdateOnTransformPersistence (this); + } +} + //======================================================================= //function : HasPresentation //purpose : diff --git a/src/AIS/AIS_InteractiveObject.hxx b/src/AIS/AIS_InteractiveObject.hxx index e66043f966..e461140b0a 100644 --- a/src/AIS/AIS_InteractiveObject.hxx +++ b/src/AIS/AIS_InteractiveObject.hxx @@ -108,6 +108,11 @@ public: //! Returns the context pointer to the interactive context. Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const; + //! Sets up Transform Persistence defining a special Local Coordinate system where this object should be located. + //! Updates the presentation in context if it is not NULL + //! @sa Graphic3d_TransformPers class description + Standard_EXPORT virtual void SetTransformPersistence (const Handle(Graphic3d_TransformPers)& theTrsfPers); + //! Returns TRUE when this object has a presentation in the current DisplayMode() Standard_EXPORT Standard_Boolean HasPresentation() const;