From e74e4eb967dd7f9973176b62e436affb74b59452 Mon Sep 17 00:00:00 2001 From: aba Date: Tue, 6 Nov 2018 15:40:57 +0300 Subject: [PATCH] 0028954: corrected cube after porting on master --- src/AIS/AIS_ViewCube.cxx | 10 ++++++---- src/AIS/AIS_ViewCube.hxx | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/AIS/AIS_ViewCube.cxx b/src/AIS/AIS_ViewCube.cxx index fb6b907df0..9af71f6f7f 100644 --- a/src/AIS/AIS_ViewCube.cxx +++ b/src/AIS/AIS_ViewCube.cxx @@ -952,11 +952,12 @@ void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMg // Display box aGroup = Prs3d_Root::NewGroup (thePrs); aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect()); + Handle(Graphic3d_Group) aTextGroup = Prs3d_Root::NewGroup (thePrs); Standard_Integer anIt = 1; for (; anIt < SIDE_INDEX; anIt++) { Handle(Side) aPart = Handle(Side)::DownCast (myParts.ChangeFromIndex (anIt)); - aPart->Display (thePrsMgr, aGroup, myDrawer->TextAspect()); + aPart->Display (thePrsMgr, aGroup, aTextGroup, myDrawer->TextAspect()); aPart->SetTransformPersistence (TransformPersistence()); } @@ -1591,8 +1592,9 @@ void AIS_ViewCube::ToolRectangle::FillArray (Handle(Graphic3d_ArrayOfTriangles)& //purpose : //======================================================================= void AIS_ViewCube::Side::Display (const Handle(PrsMgr_PresentationManager)& thePrsMgr, - const Handle(Graphic3d_Group)& theGroup, - const Handle(Prs3d_TextAspect)& theTextAspect) + const Handle(Graphic3d_Group)& theGroup, + const Handle(Graphic3d_Group)& theTextGroup, + const Handle(Prs3d_TextAspect)& theTextAspect) { Reset(); @@ -1654,7 +1656,7 @@ void AIS_ViewCube::Side::Display (const Handle(PrsMgr_PresentationManager)& theP aTool.FillArray (anArray, aTri); theGroup->AddPrimitiveArray (anArray); - Prs3d_Text::Draw (theGroup, theTextAspect, myText, aTextPosition); + Prs3d_Text::Draw (theTextGroup, theTextAspect, myText, aTextPosition); if (myHighlightPresentation.IsNull()) { diff --git a/src/AIS/AIS_ViewCube.hxx b/src/AIS/AIS_ViewCube.hxx index d8ccd82cb2..b8be300d83 100644 --- a/src/AIS/AIS_ViewCube.hxx +++ b/src/AIS/AIS_ViewCube.hxx @@ -672,6 +672,7 @@ protected: //! @name Auxilliary classes to fill presentation with proper primiti //! @param theTextAspect [in] text style. void Display (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Graphic3d_Group)& theGroup, + const Handle(Graphic3d_Group)& theTextGroup, const Handle(Prs3d_TextAspect)& theTextAspect); protected: -- 2.39.5