mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-03 14:10:33 +03:00
0030725: Visualization - remove Display calling from SetSelected methods of context
AIS_InteractiveContext::Load/ClearGlobal is modified for correct processing SetSelected for child objects. As Display/Erase of object with children displays/erases these children, then the children status inside context should also be updated. (cherry picked from commit 26b44c42ba1c2d999edf10d8dab4c02eae2c5ff7) # Conflicts: # src/AIS/AIS_InteractiveContext.hxx
This commit is contained in:
@@ -1397,9 +1397,9 @@ protected: //! @name internal methods
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Bind/Unbind status to object and object children
|
//! Bind/Unbind status to object and its children
|
||||||
//! \param theIObj object
|
//! @param theObj [in] the object to change status
|
||||||
//! \param theStatus status, if NULL, unbind object
|
//! @param theStatus status, if NULL, unbind object
|
||||||
Standard_EXPORT void setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
|
Standard_EXPORT void setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
|
||||||
const AIS_DisplayStatus theStatus,
|
const AIS_DisplayStatus theStatus,
|
||||||
const Standard_Integer theDispyMode,
|
const Standard_Integer theDispyMode,
|
||||||
|
@@ -732,7 +732,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
|
|||||||
|
|
||||||
if (!myObjects.IsBound (theObject))
|
if (!myObjects.IsBound (theObject))
|
||||||
{
|
{
|
||||||
Display (theObject, Standard_False);
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Handle(SelectMgr_EntityOwner) anOwner = theObject->GlobalSelOwner();
|
Handle(SelectMgr_EntityOwner) anOwner = theObject->GlobalSelOwner();
|
||||||
@@ -824,7 +824,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!myObjects.IsBound (anObject))
|
if (!myObjects.IsBound (anObject))
|
||||||
Display (anObject, Standard_False);
|
return;
|
||||||
|
|
||||||
if (myAutoHilight)
|
if (myAutoHilight)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user