From da0e82aac3fff843743f73f757f221ffec5ecfdb Mon Sep 17 00:00:00 2001 From: gka Date: Thu, 18 Jul 2013 13:16:35 +0400 Subject: [PATCH] 0024047: Exception in TPrsStd_AISPresentation during destruction of TDocStd_Document Adding test case for this fix Modification in order to avoid exception during destruction of AIS_InteractiveContext Small modification for trihedron Small modifications to avoid regressions Cosmetic modification --- src/AIS/AIS_InteractiveContext.cxx | 10 ++++ src/AIS/AIS_InteractiveObject.cxx | 2 + src/AIS/AIS_Trihedron.cxx | 16 +++++-- src/OpenGl/OpenGl_View.cxx | 8 +++- src/TPrsStd/TPrsStd_AISPresentation.cxx | 5 +- src/XDEDRAW/XDEDRAW.cxx | 63 +++++++++++++++++++++++++ tests/bugs/caf/bug24047 | 12 +++++ 7 files changed, 109 insertions(+), 7 deletions(-) create mode 100755 tests/bugs/caf/bug24047 diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index bd1620a5f4..591be7d937 100755 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -199,6 +199,16 @@ void AIS_InteractiveContext::Delete() const // be performed when mgrSelector will be destroyed but anyway... mgrSelector->Remove( myMainSel ); #endif + AIS_ListOfInteractive aList; + + AIS_DataMapIteratorOfDataMapOfIOStatus anIt(myObjects); + Handle(AIS_InteractiveContext) aNullContext; + for(; anIt.More() ; anIt.Next()) + { + Handle(AIS_InteractiveObject) anObj = anIt.Key(); + anObj->SetContext(aNullContext); + + } MMgt_TShared::Delete(); } diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx index e2b914bcc6..d6289aef3e 100755 --- a/src/AIS/AIS_InteractiveObject.cxx +++ b/src/AIS/AIS_InteractiveObject.cxx @@ -155,6 +155,8 @@ Handle(AIS_InteractiveContext) AIS_InteractiveObject::GetContext() const void AIS_InteractiveObject::SetContext(const Handle(AIS_InteractiveContext)& aCtx) { myCTXPtr = aCtx.operator->(); + if( aCtx.IsNull()) + return; if (myDrawer.IsNull()) { myDrawer = new AIS_Drawer; #ifdef DEB diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx index 52b1eb4977..421830c009 100755 --- a/src/AIS/AIS_Trihedron.cxx +++ b/src/AIS/AIS_Trihedron.cxx @@ -638,9 +638,20 @@ void AIS_Trihedron::LoadSubObjects() void AIS_Trihedron::SetContext(const Handle(AIS_InteractiveContext)& Ctx) { // Standard_Boolean same_DA = myDrawer->Link() == Ctx->DefaultDrawer(); - + + if( Ctx.IsNull()) + { + Standard_Integer anIdx; + for (anIdx = 0; anIdx < 7; anIdx++) + { + myShapes[anIdx]->SetContext(Ctx); + } + AIS_InteractiveObject::SetContext (Ctx); + return; + } // Remove subobjects from current context Handle(AIS_InteractiveContext) anAISContext = GetContext(); + Standard_Boolean hasContext = (anAISContext.IsNull() == Standard_False); Standard_Integer anIdx; for (anIdx = 0; anIdx < 7; anIdx++) @@ -655,9 +666,8 @@ void AIS_Trihedron::SetContext(const Handle(AIS_InteractiveContext)& Ctx) } myShapes[anIdx].Nullify(); } - + AIS_InteractiveObject::SetContext (Ctx); - LoadSubObjects(); for(Standard_Integer i= 0;i<=6;i++) myShapes[i]->SetContext (Ctx); diff --git a/src/OpenGl/OpenGl_View.cxx b/src/OpenGl/OpenGl_View.cxx index 93607bc35b..d7ccb54246 100644 --- a/src/OpenGl/OpenGl_View.cxx +++ b/src/OpenGl/OpenGl_View.cxx @@ -101,7 +101,9 @@ OpenGl_View::OpenGl_View (const CALL_DEF_VIEWCONTEXT &AContext) myIntShadingMethod(TEL_SM_GOURAUD), myAntiAliasing(Standard_False), myTransPers(&myDefaultTransPers), - myIsTransPers(Standard_False) + myIsTransPers(Standard_False), + myTrihedron(NULL), + myGraduatedTrihedron(NULL) { // Initialize matrices memcpy(myOrientationMatrix,myDefaultMatrix,sizeof(Tmatrix3)); @@ -131,6 +133,7 @@ void OpenGl_View::ReleaseGlResources (const Handle(OpenGl_Context)& theCtx) { OpenGl_Element::Destroy (theCtx, myTrihedron); OpenGl_Element::Destroy (theCtx, myGraduatedTrihedron); + if (!myTextureEnv.IsNull()) { theCtx->DelayedRelease (myTextureEnv); @@ -159,7 +162,8 @@ void OpenGl_View::SetTextureEnv (const Handle(OpenGl_Context)& theCtx, myTextureEnv = new OpenGl_Texture (theTexture->GetParams()); Handle(Image_PixMap) anImage = theTexture->GetImage(); - myTextureEnv->Init (theCtx, *anImage.operator->(), theTexture->Type()); + if( !anImage.IsNull()) + myTextureEnv->Init (theCtx, *anImage.operator->(), theTexture->Type()); } /*----------------------------------------------------------------------*/ diff --git a/src/TPrsStd/TPrsStd_AISPresentation.cxx b/src/TPrsStd/TPrsStd_AISPresentation.cxx index 560bdba4ee..2d9ab49914 100755 --- a/src/TPrsStd/TPrsStd_AISPresentation.cxx +++ b/src/TPrsStd/TPrsStd_AISPresentation.cxx @@ -1032,10 +1032,11 @@ void TPrsStd_AISPresentation::AISErase (const Standard_Boolean remove) Handle(AIS_InteractiveContext) ctx, ownctx; if ( !myAIS.IsNull() ) { - ownctx = myAIS->GetContext(); + if ( !Label().IsNull()) { Handle(TPrsStd_AISViewer) viewer; - if( !TPrsStd_AISViewer::Find(Label(), viewer) ) return; + if( !TPrsStd_AISViewer::Find(Label(), viewer) ) return; + ownctx = myAIS->GetContext(); ctx = viewer->GetInteractiveContext(); if( remove ) { if( !ctx.IsNull() ) ctx->Remove (myAIS,Standard_False); diff --git a/src/XDEDRAW/XDEDRAW.cxx b/src/XDEDRAW/XDEDRAW.cxx index 54b9510982..7e59d3e90a 100755 --- a/src/XDEDRAW/XDEDRAW.cxx +++ b/src/XDEDRAW/XDEDRAW.cxx @@ -98,6 +98,9 @@ #include #include #include +#include +#include +#include #define ZVIEW_SIZE 1000000.0 // avoid warnings on 'extern "C"' functions returning C++ classes @@ -1008,6 +1011,65 @@ static Standard_Integer XShowFaceBoundary (Draw_Interpretor& di, return 0; } +//======================================================================= +//function : testDoc +//purpose : Method to test destruction of document +//======================================================================= +static Standard_Integer testDoc (Draw_Interpretor& di, + Standard_Integer argc, + const char ** argv) +{ + if( argc < 2 ) + { + cout<<"Invalid numbers of arguments should be: XTestDoc shape"<Open(A); + + Handle(V3d_Viewer) vw = ViewerTest_Tool::MakeViewer ("Test viwer"); + Handle(AIS_InteractiveContext) aContext = new AIS_InteractiveContext(vw); + TPrsStd_AISViewer::New (aD1->Main(),aContext); + // get shape tool for shape verification + Handle(XCAFDoc_ShapeTool) aShapes = + XCAFDoc_DocumentTool::ShapeTool (aD1->Main()); + TDF_Label aLab = aShapes->AddShape(shape); + + Handle(Geom_Axis2Placement) aPlacement = + new Geom_Axis2Placement (gp::Origin(), gp::DZ(),gp::DX()); + Handle(AIS_Trihedron) aTriShape = new AIS_Trihedron (aPlacement); + + Handle(TNaming_NamedShape) NS; + Handle(TPrsStd_AISPresentation) prs; + if( aLab.FindAttribute( TNaming_NamedShape::GetID(), NS) ) { + prs = TPrsStd_AISPresentation::Set( NS ); + } + + if( aLab.FindAttribute(TPrsStd_AISPresentation::GetID(), prs) ) + prs->Display(); + + + TPrsStd_AISViewer::Update(aLab); + aContext->Display(aTriShape, Standard_True); + Handle(TDocStd_Owner) owner; + if (aD1->Main().Root().FindAttribute(TDocStd_Owner::GetID(), owner)) + { + Handle_TDocStd_Document empty; + owner->SetDocument(empty); + } + aContext.Nullify(); + aD1->Close(); + aD1.Nullify(); + return 0; +} + + //======================================================================= //function : Init //purpose : @@ -1082,6 +1144,7 @@ void XDEDRAW::Init(Draw_Interpretor& di) "Doc Label IsOn [R G B [LineWidth [LineStyle]]]:" "- turns on/off drawing of face boundaries and defines boundary line style", __FILE__, XShowFaceBoundary, g); + di.Add ("XTestDoc", "XTestDoc shape", __FILE__, testDoc, g); // Specialized commands XDEDRAW_Shapes::InitCommands ( di ); diff --git a/tests/bugs/caf/bug24047 b/tests/bugs/caf/bug24047 new file mode 100755 index 0000000000..fa3ab31eff --- /dev/null +++ b/tests/bugs/caf/bug24047 @@ -0,0 +1,12 @@ +puts "============" +puts "OCC24047" +puts "============" +puts "" +####################################################################### +# Exception in TPrsStd_AISPresentation during destruction of TDocStd_Document +####################################################################### + +pload XDEDRAW + +box a 0 0 0 10 10 10 +XTestDoc a