OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025528: Visualization - Exception on removing an interactive object from a local context

Browse Source 
AIS_LocalContext::Remove() corrected to unbind the argument from
myActiveObjects at the very end. Also some code clean up applied
(e.g. duplicated AddOrRemoveSelected() call removed, formatting corrected).

code formatting
This commit is contained in:
san
2014-12-04 14:14:14 +03:00
committed by bugmaster
parent 3ea0a91b70
commit 7fd6425dc4
2 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/AIS/AIS_LocalContext.cxx
View File

@@ -445,65 +445,67 @@ void AIS_LocalContext::Deactivate(const Handle(AIS_InteractiveObject)& aSelectab
Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& aSelectable)
{
if(!myActiveObjects.IsBound(aSelectable)) return Standard_False;
if(!myActiveObjects.IsBound (aSelectable))
{
return Standard_False;
}
if (IsSelected (aSelectable))
{
AddOrRemoveSelected (aSelectable, Standard_False);
}
const Handle(AIS_LocalStatus)& Att = myActiveObjects (aSelectable);
if(IsSelected(aSelectable))
AddOrRemoveSelected(aSelectable,Standard_False);
const Handle(AIS_LocalStatus)& Att = myActiveObjects(aSelectable);
TColStd_ListIteratorOfListOfInteger It;
// it is checked which were the temporary attributes
// and they are set to 0
// desactivate standard modes
if(Att->Decomposed()){
for(It.Initialize(myListOfStandardMode);It.More();It.Next()){
mySM->Deactivate(aSelectable,It.Value(),myMainVS);
// Deactivate standard modes
if (Att->Decomposed())
{
for (It.Initialize (myListOfStandardMode); It.More(); It.Next())
{
mySM->Deactivate (aSelectable, It.Value(), myMainVS);
}
}
// if object or temporary presentations...
if(Att->IsTemporary())
{
if(Att->IsSubIntensityOn())
myMainPM->Unhighlight(aSelectable,Att->HilightMode());
// remove if bug on clear correct...
myMainPM->Erase(aSelectable,Att->DisplayMode());
myMainPM->Clear(aSelectable,Att->DisplayMode());
if(myMainPM->IsDisplayed(aSelectable,Att->HilightMode()))
myMainPM->Erase(aSelectable,Att->HilightMode());
// myMainPM->Clear(aSelectable,Att->HilightMode());
}
// if below intensity
else
{
if(Att->IsSubIntensityOn())
myCTX->SubIntensityOff(aSelectable);
}
// desactivate stored proper modes
for(It.Initialize(Att->SelectionModes());It.More();It.Next()){
mySM->Deactivate(aSelectable,It.Value(),myMainVS);
}
// pop : si je laisses cela plantes dans les elements de construction
// alors a toi de jouer ROB
// RemoveSelected(aSelectable);
if(IsSelected(aSelectable))
AddOrRemoveSelected(aSelectable);
myActiveObjects.UnBind(aSelectable);
// If object or temporary presentations
if (Att->IsTemporary())
{
if (Att->IsSubIntensityOn())
{
myMainPM->Unhighlight (aSelectable, Att->HilightMode());
}
myMainPM->Erase (aSelectable, Att->DisplayMode());
myMainPM->Clear (aSelectable, Att->DisplayMode());
if (myMainPM->IsDisplayed (aSelectable, Att->HilightMode()))
{
myMainPM->Erase (aSelectable, Att->HilightMode());
}
}
// If subintensity used
else if (Att->IsSubIntensityOn())
{
myCTX->SubIntensityOff (aSelectable);
}
// Deactivate stored selection modes
for (It.Initialize (Att->SelectionModes()); It.More(); It.Next())
{
mySM->Deactivate (aSelectable, It.Value(), myMainVS);
}
// Remove the interactive object from selection manager
if (mySM->Contains (aSelectable))
{
mySM->Remove (aSelectable);
}
UpdateSort();
ClearOutdatedSelection (aSelectable, Standard_True);
// This should be done at the very end because most methods use
// myActiveObjects even during clean-up
myActiveObjects.UnBind (aSelectable);
return Standard_True;
}