OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027680: Visualization - AIS_InteractiveContext::Remove() should remove all presentation of the object

Browse Source
This commit is contained in:
isk 2016-08-01 15:30:40 +03:00 committed by bugmaster
parent 6d0e6be5a2
commit e2d7642f14
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/AIS/AIS_InteractiveContext.cxx
View File

@ -2484,17 +2484,8 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj); Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
unhighlightOwners (theIObj); unhighlightOwners (theIObj);
for (TColStd_ListIteratorOfListOfInteger aDispModeIter (aStatus->DisplayedModes()); aDispModeIter.More(); aDispModeIter.Next())
{
myMainPM->Erase (theIObj, aDispModeIter.Value());
myMainPM->Clear (theIObj, aDispModeIter.Value());
}
if (aStatus->IsHilighted() myMainPM->Erase (theIObj, -1);
&& theIObj->HasHilightMode())
{
myMainPM->Unhighlight (theIObj, theIObj->HilightMode());
}
// Object removes from Detected sequence // Object removes from Detected sequence
for(Standard_Integer aDetIter = 1; aDetIter < myAISDetectedSeq.Length(); ++aDetIter) for(Standard_Integer aDetIter = 1; aDetIter < myAISDetectedSeq.Length(); ++aDetIter)
@ -2555,7 +2546,6 @@ void AIS_InteractiveContext::ClearGlobalPrs (const Handle(AIS_InteractiveObject)
} }
myMainPM->Erase (theIObj, theMode); myMainPM->Erase (theIObj, theMode);
myMainPM->Clear (theIObj, theMode);
} }
if (aStatus->GraphicStatus() == AIS_DS_Displayed if (aStatus->GraphicStatus() == AIS_DS_Displayed

1
src/AIS/AIS_LocalContext.cxx
View File

@ -453,7 +453,6 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
} }
myMainPM->Erase (aSelectable, Att->DisplayMode()); myMainPM->Erase (aSelectable, Att->DisplayMode());
myMainPM->Clear (aSelectable, Att->DisplayMode());
if (myMainPM->IsDisplayed (aSelectable, Att->HilightMode())) if (myMainPM->IsDisplayed (aSelectable, Att->HilightMode()))
{ {
myMainPM->Erase (aSelectable, Att->HilightMode()); myMainPM->Erase (aSelectable, Att->HilightMode());

30
src/PrsMgr/PrsMgr_PresentationManager.cxx
View File

@ -89,19 +89,31 @@ void PrsMgr_PresentationManager::Erase (const Handle(PrsMgr_PresentableObject)&
} }
PrsMgr_Presentations& aPrsList = thePrsObj->Presentations(); PrsMgr_Presentations& aPrsList = thePrsObj->Presentations();
for (Standard_Integer aPrsIter = 1; aPrsIter <= aPrsList.Length(); ++aPrsIter) for (PrsMgr_Presentations::Iterator anIt (aPrsList); anIt.More();)
{ {
const PrsMgr_ModedPresentation& aModedPrs = aPrsList.Value (aPrsIter); const PrsMgr_ModedPresentation& aModedPrs = anIt.Value();
const Handle(PrsMgr_PresentationManager)& aPrsMgr = aModedPrs.Presentation()->PresentationManager(); if (aModedPrs.Presentation().IsNull())
if (theMode == aPrsList (aPrsIter).Mode()
&& this == aPrsMgr)
{ {
if (!aModedPrs.Presentation().IsNull()) anIt.Next();
continue;
}
const Handle(PrsMgr_PresentationManager)& aPrsMgr = aModedPrs.Presentation()->PresentationManager();
if ((theMode == aModedPrs.Mode() || theMode == -1)
&& (this == aPrsMgr))
{
aModedPrs.Presentation()->Erase();
aPrsList.Remove (anIt);
if (theMode != -1)
{ {
aModedPrs.Presentation()->Erase(); return;
} }
aPrsList.Remove (aPrsIter); }
return; else
{
anIt.Next();
} }
} }
} }

1
src/PrsMgr/PrsMgr_PresentationManager.hxx
View File

@ -59,6 +59,7 @@ public:
//! erases the presentation of the object in the given //! erases the presentation of the object in the given
//! Presentation manager with the given mode. //! Presentation manager with the given mode.
//! If @theMode is -1, then erases all presentations of the object.
Standard_EXPORT void Erase (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode = 0); Standard_EXPORT void Erase (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode = 0);