OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0026076: Visualization - empty bounding box of a shape after closing local context

Browse Source 
Fixed handling of invalid bounding boxes;
Links related to temporary objects are now removed from selection structures;
Test case for issue #26076
This commit is contained in:
vpa
2015-04-17 20:12:29 +03:00
committed by bugmaster
parent 2afd4e9888
commit b3c433fea3
6 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/AIS/AIS_InteractiveObject.cxx
View File

@@ -603,6 +603,13 @@ void AIS_InteractiveObject::BoundingBox (Bnd_Box& theBndBox)
const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations.First().Presentation();
const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
const Graphic3d_BndBox4f& aBndBox = aStruct->CStructure()->BoundingBox();
if (!aBndBox.IsValid())
{
theBndBox.SetVoid();
return;
}
theBndBox.Update (static_cast<Standard_Real> (aBndBox.CornerMin().x()),
static_cast<Standard_Real> (aBndBox.CornerMin().y()),
static_cast<Standard_Real> (aBndBox.CornerMin().z()),
@@ -636,6 +643,13 @@ void AIS_InteractiveObject::BoundingBox (Bnd_Box& theBndBox)
const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations (aPrsIter).Presentation();
const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
const Graphic3d_BndBox4f& aBndBox = aStruct->CStructure()->BoundingBox();
if (!aBndBox.IsValid())
{
theBndBox.SetVoid();
return;
}
theBndBox.Update (static_cast<Standard_Real> (aBndBox.CornerMin().x()),
static_cast<Standard_Real> (aBndBox.CornerMin().y()),
static_cast<Standard_Real> (aBndBox.CornerMin().z()),

11
src/AIS/AIS_LocalContext.cxx
View File

@@ -1017,8 +1017,17 @@ void AIS_LocalContext::ClearObjects()
}
ClearSelected( Standard_False );
// Clear selection structures for temporary objects, created in local context
for (AIS_DataMapIteratorOfDataMapOfSelStat anIter (myActiveObjects); anIter.More(); anIter.Next())
{
if (anIter.Value()->IsTemporary())
{
mySM->Remove (anIter.Key(), myMainVS);
}
}
myActiveObjects.Clear();
// myMainVS->ClearAreas();myMainVS->ClearSensitive();
}

3
src/SelectMgr/SelectMgr_SelectableObjectSet.cxx
View File

@@ -72,6 +72,9 @@ Select3D_BndBox3d SelectMgr_SelectableObjectSet::Box (const Standard_Integer the
const Handle(SelectMgr_SelectableObject)& anObject = GetObjectById (theIndex);
Bnd_Box aBox;
anObject->BoundingBox (aBox);
if (aBox.IsVoid())
return Select3D_BndBox3d();
return Select3D_BndBox3d (SelectMgr_Vec3 (aBox.CornerMin().X(), aBox.CornerMin().Y(), aBox.CornerMin().Z()),
SelectMgr_Vec3 (aBox.CornerMax().X(), aBox.CornerMax().Y(), aBox.CornerMax().Z()));
}

3
src/SelectMgr/SelectMgr_SelectionManager.cxx
View File

@@ -273,9 +273,6 @@ void SelectMgr_SelectionManager::Remove (const Handle(SelectMgr_SelectableObject
break;
}
}
theSelector->RemoveSelectionOfObject (theObject, theObject->CurrentSelection());
theSelector->RemoveSelectableObject (theObject);
theObject->CurrentSelection()->UpdateBVHStatus (SelectMgr_TBU_Remove);
if (aSelectors.IsEmpty())
{

3
src/ViewerTest/ViewerTest.cxx
View File

@@ -3478,7 +3478,8 @@ static int VDisplay2 (Draw_Interpretor& theDI,
{
aShape->SetHilightMode (anObjHighMode);
}
GetMapOfAIS().Bind (aShape, aName);
if (!toDisplayLocal)
GetMapOfAIS().Bind (aShape, aName);
Standard_Integer aDispMode = aShape->HasDisplayMode()
? aShape->DisplayMode()