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

0028927: Visualization - Graphic3d_StructureManager destructor should invalidate its pointer in Graphic3d_Structure

Browse Source 
Graphic3d_Structure::myFirstStructureManager - removed unused class field.
~Graphic3d_StructureManager() now removes displayed Structures explicitly.
This commit is contained in:
kgv 2017-07-19 17:38:54 +03:00 committed by bugmaster
parent 983fd6c02b
commit b4fd9d00c2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Graphic3d/Graphic3d_Structure.cxx
View File

@ -42,7 +42,6 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure,Standard_Transient)
//============================================================================= //=============================================================================
Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManager)& theManager) Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManager)& theManager)
: myStructureManager(theManager.operator->()), : myStructureManager(theManager.operator->()),
myFirstStructureManager (theManager.operator->()),
myComputeVisual (Graphic3d_TOS_ALL), myComputeVisual (Graphic3d_TOS_ALL),
myOwner (NULL), myOwner (NULL),
myVisual (Graphic3d_TOS_ALL) myVisual (Graphic3d_TOS_ALL)
@ -57,7 +56,6 @@ Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManage
Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManager)& theManager, Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManager)& theManager,
const Handle(Graphic3d_Structure)& thePrs) const Handle(Graphic3d_Structure)& thePrs)
: myStructureManager(theManager.operator->()), : myStructureManager(theManager.operator->()),
myFirstStructureManager (theManager.operator->()),
myComputeVisual (thePrs->myComputeVisual), myComputeVisual (thePrs->myComputeVisual),
myOwner (thePrs->myOwner), myOwner (thePrs->myOwner),
myVisual (thePrs->myVisual) myVisual (thePrs->myVisual)
@ -71,9 +69,9 @@ Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManage
//============================================================================= //=============================================================================
Graphic3d_Structure::~Graphic3d_Structure() Graphic3d_Structure::~Graphic3d_Structure()
{ {
// as myFirstStructureManager can be already destroyed, // as myStructureManager can be already destroyed,
// avoid attempts to access it // avoid attempts to access it
myFirstStructureManager = NULL; myStructureManager = NULL;
Remove(); Remove();
} }

1
src/Graphic3d/Graphic3d_Structure.hxx
View File

@ -440,7 +440,6 @@ private:
protected: protected:
Graphic3d_StructureManager* myStructureManager; Graphic3d_StructureManager* myStructureManager;
Graphic3d_StructureManager* myFirstStructureManager;
Graphic3d_TypeOfStructure myComputeVisual; Graphic3d_TypeOfStructure myComputeVisual;
Handle(Graphic3d_CStructure) myCStructure; Handle(Graphic3d_CStructure) myCStructure;

9
src/Graphic3d/Graphic3d_StructureManager.cxx
View File

@ -42,6 +42,11 @@ Graphic3d_StructureManager::Graphic3d_StructureManager (const Handle(Graphic3d_G
// ======================================================================== // ========================================================================
Graphic3d_StructureManager::~Graphic3d_StructureManager() Graphic3d_StructureManager::~Graphic3d_StructureManager()
{ {
for (Graphic3d_MapIteratorOfMapOfStructure anIt (myDisplayedStructure); anIt.More(); anIt.Next())
{
anIt.Value()->Remove();
}
myDisplayedStructure.Clear(); myDisplayedStructure.Clear();
myHighlightedStructure.Clear(); myHighlightedStructure.Clear();
myDefinedViews.Clear(); myDefinedViews.Clear();
@ -66,6 +71,10 @@ void Graphic3d_StructureManager::Update (const Graphic3d_ZLayerId theLayerId) co
void Graphic3d_StructureManager::Remove() void Graphic3d_StructureManager::Remove()
{ {
// clear all structures whilst views are alive for correct GPU memory management // clear all structures whilst views are alive for correct GPU memory management
for (Graphic3d_MapIteratorOfMapOfStructure anIt (myDisplayedStructure); anIt.More(); anIt.Next())
{
anIt.Value()->Remove();
}
myDisplayedStructure.Clear(); myDisplayedStructure.Clear();
myHighlightedStructure.Clear(); myHighlightedStructure.Clear();