1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00

0030728: Visualization - using one implementation of highlight/unhighlight in context

(cherry picked from commit 36b87936acf5a89d573663b5e8d086a4a4a084d3)

# Conflicts:
#	src/AIS/AIS_InteractiveContext_1.cxx
(cherry picked from commit 7fc133f086611b4f4e36b658f99c29012da921d1)

# Conflicts:
#	src/AIS/AIS_InteractiveContext_1.cxx
(cherry picked from commit a06b8e8308)
(cherry picked from commit 0d5a72ab1638e4ed3d3eb72b15430ee7337f69bc)

# Conflicts:
#	src/AIS/AIS_InteractiveContext.cxx
(cherry picked from commit 9e9c9c84bd)
This commit is contained in:
nds
2019-05-22 17:33:02 +03:00
parent 68be9e7b9c
commit f25bebd7b3
3 changed files with 69 additions and 106 deletions

View File

@@ -2000,10 +2000,10 @@ void AIS_InteractiveContext::EraseGlobal (const Handle(AIS_InteractiveObject)& t
} }
//======================================================================= //=======================================================================
//function : unhighlightOwners //function : unselectOwners
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveContext::unhighlightOwners (const Handle(AIS_InteractiveObject)& theObject) void AIS_InteractiveContext::unselectOwners (const Handle(AIS_InteractiveObject)& theObject)
{ {
SelectMgr_SequenceOfOwner aSeq; SelectMgr_SequenceOfOwner aSeq;
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next()) for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
@@ -2037,7 +2037,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
return; return;
} }
unhighlightOwners (theIObj); unselectOwners (theIObj);
myMainPM->Erase (theIObj, -1); myMainPM->Erase (theIObj, -1);
theIObj->ErasePresentations (true); // make sure highlighting presentations are properly erased theIObj->ErasePresentations (true); // make sure highlighting presentations are properly erased

View File

@@ -1235,7 +1235,7 @@ protected: //! @name internal methods
Standard_EXPORT Standard_Integer PurgeViewer (const Handle(V3d_Viewer)& Vwr); Standard_EXPORT Standard_Integer PurgeViewer (const Handle(V3d_Viewer)& Vwr);
//! Helper function to unhighlight all entity owners currently highlighted with seleciton color. //! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
Standard_EXPORT void unhighlightOwners (const Handle(AIS_InteractiveObject)& theObject); Standard_EXPORT void unselectOwners (const Handle(AIS_InteractiveObject)& theObject);
//! Helper function that highlights the owner given with <theStyle> without //! Helper function that highlights the owner given with <theStyle> without
//! performing AutoHighlight checks, e.g. is used for dynamic highlight. //! performing AutoHighlight checks, e.g. is used for dynamic highlight.
@@ -1246,12 +1246,17 @@ protected: //! @name internal methods
//! for AutoHighlight, e.g. is used for selection. //! for AutoHighlight, e.g. is used for selection.
Standard_EXPORT void highlightSelected (const Handle(SelectMgr_EntityOwner)& theOwner); Standard_EXPORT void highlightSelected (const Handle(SelectMgr_EntityOwner)& theOwner);
//! Helper function that highlights the owners given with <theStyle> with check
//! for AutoHighlight, e.g. is used for selection.
Standard_EXPORT void highlightOwners (const AIS_NListOfEntityOwner& theOwners,
const Standard_Boolean& theToUseObjectDisplayMode);
//! Helper function that highlights global owner of the object given with <theStyle> with check //! Helper function that highlights global owner of the object given with <theStyle> with check
//! for AutoHighlight, e.g. is used for selection. //! for AutoHighlight, e.g. is used for selection.
//! If global owner is null, it simply highlights the whole object //! If global owner is null, it simply highlights the whole object
Standard_EXPORT void highlightGlobal (const Handle(AIS_InteractiveObject)& theObj, Standard_EXPORT void highlightGlobal (const Handle(AIS_InteractiveObject)& theObj,
const Handle(Prs3d_Drawer)& theStyle, const Handle(Prs3d_Drawer)& theStyle,
const Standard_Integer theDispMode) const; const Standard_Integer theDispMode);
//! Helper function that unhighlights all owners that are stored in current AIS_Selection. //! Helper function that unhighlights all owners that are stored in current AIS_Selection.
//! The function updates global status and selection state of owner and interactive object. //! The function updates global status and selection state of owner and interactive object.
@@ -1259,9 +1264,14 @@ protected: //! @name internal methods
//! switched on in AIS_GlobalStatus will be highlighted with context's sub-intensity color. //! switched on in AIS_GlobalStatus will be highlighted with context's sub-intensity color.
Standard_EXPORT void unhighlightSelected (const Standard_Boolean theIsToHilightSubIntensity = Standard_False); Standard_EXPORT void unhighlightSelected (const Standard_Boolean theIsToHilightSubIntensity = Standard_False);
//! Helper function that highlights the owners given with <theStyle> with check
//! for AutoHighlight, e.g. is used for selection.
Standard_EXPORT void unhighlightOwners (const AIS_NListOfEntityOwner& theOwners,
const Standard_Boolean theIsToHilightSubIntensity = Standard_False);
//! Helper function that unhighlights global selection owner of given interactive. //! Helper function that unhighlights global selection owner of given interactive.
//! The function does not perform any updates of global or owner status //! The function does not perform any updates of global or owner status
Standard_EXPORT void unhighlightGlobal (const Handle(AIS_InteractiveObject)& theObj) const; Standard_EXPORT void unhighlightGlobal (const Handle(AIS_InteractiveObject)& theObj);
//! Helper function that turns on sub-intensity in global status and highlights //! Helper function that turns on sub-intensity in global status and highlights
//! given objects with sub-intensity color //! given objects with sub-intensity color

View File

@@ -85,30 +85,9 @@ void AIS_InteractiveContext::highlightWithColor (const Handle(SelectMgr_EntityOw
//======================================================================= //=======================================================================
void AIS_InteractiveContext::highlightSelected (const Handle(SelectMgr_EntityOwner)& theOwner) void AIS_InteractiveContext::highlightSelected (const Handle(SelectMgr_EntityOwner)& theOwner)
{ {
const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable()); AIS_NListOfEntityOwner anOwners;
if (anObj.IsNull()) anOwners.Append (theOwner);
{ highlightOwners (anOwners, Standard_False/*check if it is really important*/);
return;
}
if (!theOwner->IsAutoHilight())
{
SelectMgr_SequenceOfOwner aSeq;
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
{
if (aSelIter.Value()->IsSameSelectable (anObj))
{
aSeq.Append (aSelIter.Value());
}
}
anObj->HilightSelected (myMainPM, aSeq);
}
else
{
const Handle(Prs3d_Drawer)& aStyle = getSelStyle (anObj, theOwner);
const Standard_Integer aHiMode = getHilightMode (anObj, aStyle, -1);
theOwner->HilightWithColor (myMainPM, aStyle, aHiMode);
}
} }
//======================================================================= //=======================================================================
@@ -117,14 +96,15 @@ void AIS_InteractiveContext::highlightSelected (const Handle(SelectMgr_EntityOwn
//======================================================================= //=======================================================================
void AIS_InteractiveContext::highlightGlobal (const Handle(AIS_InteractiveObject)& theObj, void AIS_InteractiveContext::highlightGlobal (const Handle(AIS_InteractiveObject)& theObj,
const Handle(Prs3d_Drawer)& theStyle, const Handle(Prs3d_Drawer)& theStyle,
const Standard_Integer theDispMode) const const Standard_Integer /*theDispMode*/)
{ {
if (theObj.IsNull()) if (theObj.IsNull())
{ {
return; return;
} }
const Standard_Integer aHiMode = getHilightMode (theObj, theStyle, theDispMode); const Handle(AIS_GlobalStatus)& aStatus = myObjects (theObj);
const Standard_Integer aHiMode = getHilightMode (theObj, theStyle, aStatus->DisplayMode());
const Handle(SelectMgr_EntityOwner)& aGlobOwner = theObj->GlobalSelOwner(); const Handle(SelectMgr_EntityOwner)& aGlobOwner = theObj->GlobalSelOwner();
if (aGlobOwner.IsNull()) if (aGlobOwner.IsNull())
@@ -133,22 +113,9 @@ void AIS_InteractiveContext::highlightGlobal (const Handle(AIS_InteractiveObject
return; return;
} }
if (!aGlobOwner->IsAutoHilight()) AIS_NListOfEntityOwner anOwners;
{ anOwners.Append (aGlobOwner);
SelectMgr_SequenceOfOwner aSeq; highlightOwners (anOwners, Standard_True);
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
{
if (aSelIter.Value()->IsSameSelectable (theObj))
{
aSeq.Append (aSelIter.Value());
}
}
theObj->HilightSelected (myMainPM, aSeq);
}
else
{
aGlobOwner->HilightWithColor (myMainPM, theStyle, aHiMode);
}
} }
//======================================================================= //=======================================================================
@@ -156,24 +123,30 @@ void AIS_InteractiveContext::highlightGlobal (const Handle(AIS_InteractiveObject
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsToHilightSubIntensity) void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsToHilightSubIntensity)
{
unhighlightOwners (mySelection->Objects(), theIsToHilightSubIntensity);
}
//=======================================================================
//function : unhighlightOwners
//purpose :
//=======================================================================
void AIS_InteractiveContext::unhighlightOwners (const AIS_NListOfEntityOwner& theOwners,
const Standard_Boolean theIsToHilightSubIntensity)
{ {
NCollection_IndexedMap<Handle(AIS_InteractiveObject)> anObjToClear; NCollection_IndexedMap<Handle(AIS_InteractiveObject)> anObjToClear;
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next()) for (AIS_NListOfEntityOwner::Iterator aSelIter (theOwners); aSelIter.More(); aSelIter.Next())
{ {
const Handle(SelectMgr_EntityOwner) anOwner = aSelIter.Value(); const Handle(SelectMgr_EntityOwner) anOwner = aSelIter.Value();
const Handle(AIS_InteractiveObject) anInteractive = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable()); const Handle(AIS_InteractiveObject) anInteractive = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
Handle(AIS_GlobalStatus) aStatus; Handle(AIS_GlobalStatus)& aStatus = myObjects.ChangeFind (anInteractive);
if (!myObjects.Find (anInteractive, aStatus))
{
continue;
}
if (anOwner->IsAutoHilight()) if (anOwner->IsAutoHilight())
{ {
anOwner->Unhilight (myMainPM); anOwner->Unhilight (myMainPM);
if (theIsToHilightSubIntensity) if (theIsToHilightSubIntensity)
{ {
if (aStatus->IsSubIntensityOn()) if (!aStatus.IsNull() && aStatus->IsSubIntensityOn())
{ {
const Standard_Integer aHiMode = getHilightMode (anInteractive, aStatus->HilightStyle(), aStatus->DisplayMode()); const Standard_Integer aHiMode = getHilightMode (anInteractive, aStatus->HilightStyle(), aStatus->DisplayMode());
highlightWithSubintensity (anOwner, aHiMode); highlightWithSubintensity (anOwner, aHiMode);
@@ -184,9 +157,9 @@ void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsTo
{ {
anObjToClear.Add (anInteractive); anObjToClear.Add (anInteractive);
} }
if (anOwner == anInteractive->GlobalSelOwner()) if (!aStatus.IsNull() && anOwner == anInteractive->GlobalSelOwner())
{ {
myObjects.ChangeFind (anInteractive)->SetHilightStatus (Standard_False); aStatus->SetHilightStatus (Standard_False);
} }
} }
for (NCollection_IndexedMap<Handle(AIS_InteractiveObject)>::Iterator anIter (anObjToClear); anIter.More(); anIter.Next()) for (NCollection_IndexedMap<Handle(AIS_InteractiveObject)>::Iterator anIter (anObjToClear); anIter.More(); anIter.Next())
@@ -201,7 +174,7 @@ void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsTo
//function : unhighlightGlobal //function : unhighlightGlobal
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveContext::unhighlightGlobal (const Handle(AIS_InteractiveObject)& theObj) const void AIS_InteractiveContext::unhighlightGlobal (const Handle(AIS_InteractiveObject)& theObj)
{ {
if (theObj.IsNull()) if (theObj.IsNull())
{ {
@@ -215,15 +188,9 @@ void AIS_InteractiveContext::unhighlightGlobal (const Handle(AIS_InteractiveObje
return; return;
} }
if (aGlobOwner->IsAutoHilight()) AIS_NListOfEntityOwner anOwners;
{ anOwners.Append (aGlobOwner);
aGlobOwner->Unhilight (myMainPM); unhighlightOwners (anOwners);
}
else
{
myMainPM->Unhighlight (theObj);
theObj->ClearSelected();
}
} }
//======================================================================= //=======================================================================
@@ -720,14 +687,31 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
{ {
// In case of selection without using local context // In case of selection without using local context
clearDynamicHighlight(); clearDynamicHighlight();
highlightOwners (mySelection->Objects(), Standard_True);
if (theToUpdateViewer)
UpdateCurrentViewer();
}
//=======================================================================
//function : highlightOwners
//purpose :
//=======================================================================
void AIS_InteractiveContext::highlightOwners (const AIS_NListOfEntityOwner& theOwners,
const Standard_Boolean& theToUseObjectDisplayMode)
{
AIS_MapOfObjSelectedOwners anObjOwnerMap; AIS_MapOfObjSelectedOwners anObjOwnerMap;
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next()) for (AIS_NListOfEntityOwner::Iterator aSelIter (theOwners); aSelIter.More(); aSelIter.Next())
{ {
const Handle(SelectMgr_EntityOwner) anOwner = aSelIter.Value(); const Handle(SelectMgr_EntityOwner) anOwner = aSelIter.Value();
const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable()); const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
if (anObj.IsNull())
continue;
const Handle(Prs3d_Drawer)& anObjSelStyle = getSelStyle (anObj, anOwner); const Handle(Prs3d_Drawer)& anObjSelStyle = getSelStyle (anObj, anOwner);
Handle(AIS_GlobalStatus)& aState = myObjects.ChangeFind(anObj); Handle(AIS_GlobalStatus)& aState = myObjects.ChangeFind(anObj);
if (anOwner == anObj->GlobalSelOwner()) if (theToUseObjectDisplayMode && anOwner == anObj->GlobalSelOwner())
{ {
aState->SetHilightStatus (Standard_True); aState->SetHilightStatus (Standard_True);
aState->SetHilightStyle (anObjSelStyle); aState->SetHilightStyle (anObjSelStyle);
@@ -748,7 +732,7 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
} }
else else
{ {
const Standard_Integer aHiMode = getHilightMode (anObj, anObjSelStyle, aState->DisplayMode()); const Standard_Integer aHiMode = getHilightMode (anObj, anObjSelStyle, theToUseObjectDisplayMode ? aState->DisplayMode() : -1);
anOwner->HilightWithColor (myMainPM, anObjSelStyle, aHiMode); anOwner->HilightWithColor (myMainPM, anObjSelStyle, aHiMode);
} }
} }
@@ -761,9 +745,6 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
} }
anObjOwnerMap.Clear(); anObjOwnerMap.Clear();
} }
if (theToUpdateViewer)
UpdateCurrentViewer();
} }
//======================================================================= //=======================================================================
@@ -772,17 +753,7 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
//======================================================================= //=======================================================================
void AIS_InteractiveContext::UnhilightSelected (const Standard_Boolean theToUpdateViewer) void AIS_InteractiveContext::UnhilightSelected (const Standard_Boolean theToUpdateViewer)
{ {
for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next()) unhighlightSelected();
{
const Handle(SelectMgr_EntityOwner) anOwner = aSelIter.Value();
const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
if (anOwner == anObj->GlobalSelOwner())
{
myObjects.ChangeFind (anObj)->SetHilightStatus (Standard_False);
}
anOwner->Unhilight (myMainPM);
}
if (theToUpdateViewer) if (theToUpdateViewer)
UpdateCurrentViewer(); UpdateCurrentViewer();
@@ -937,13 +908,6 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
} }
} }
if (myAutoHilight && theOwner == anObject->GlobalSelOwner())
{
Handle(AIS_GlobalStatus)& aState = myObjects.ChangeFind (anObject);
aState->SetHilightStatus (Standard_True);
aState->SetHilightStyle (anObjSelStyle);
}
if (theToUpdateViewer) if (theToUpdateViewer)
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
@@ -990,28 +954,17 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
if (myAutoHilight) if (myAutoHilight)
{ {
const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable()); const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable());
const Standard_Boolean isGlobal = anObj->GlobalSelOwner() == theOwner;
Handle(AIS_GlobalStatus)& aStatus = myObjects.ChangeFind (anObj); Handle(AIS_GlobalStatus)& aStatus = myObjects.ChangeFind (anObj);
if (theOwner->IsSelected()) if (theOwner->IsSelected())
{ {
highlightSelected (theOwner); highlightSelected (theOwner);
if (isGlobal)
{
aStatus->SetHilightStatus (Standard_True);
aStatus->SetHilightStyle (getSelStyle (anObj, theOwner));
}
} }
else else
{ {
if (theOwner->IsAutoHilight()) AIS_NListOfEntityOwner anOwners;
{ anOwners.Append (theOwner);
theOwner->Unhilight (myMainPM); unhighlightOwners (anOwners);
}
else
{
anObj->ClearSelected();
}
aStatus->SetHilightStatus (Standard_False);
aStatus->SetHilightStyle (Handle(Prs3d_Drawer)()); aStatus->SetHilightStyle (Handle(Prs3d_Drawer)());
} }
} }