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

0026433: AIS_Dimension may attempt to modify the state of default Drawer shading aspect

Browse Source 
- Added checks to allow modification of only own aspects in AIS_Dimension::DrawText()
This commit is contained in:
duv 2015-07-14 17:42:27 +03:00 committed by bugmaster
parent dcc0a33ebd
commit d2dfbc4d7d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/AIS/AIS_Dimension.cxx
View File

@ -496,6 +496,11 @@ void AIS_Dimension::DrawText (const Handle(Prs3d_Presentation)& thePresentation,
if (myDrawer->DimensionAspect()->IsTextShaded()) if (myDrawer->DimensionAspect()->IsTextShaded())
{ {
// Setting text shading and color parameters // Setting text shading and color parameters
if (!myDrawer->HasOwnShadingAspect())
{
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
}
Graphic3d_MaterialAspect aShadeMat (Graphic3d_NOM_DEFAULT); Graphic3d_MaterialAspect aShadeMat (Graphic3d_NOM_DEFAULT);
aShadeMat.SetReflectionModeOff (Graphic3d_TOR_AMBIENT); aShadeMat.SetReflectionModeOff (Graphic3d_TOR_AMBIENT);
aShadeMat.SetReflectionModeOff (Graphic3d_TOR_DIFFUSE); aShadeMat.SetReflectionModeOff (Graphic3d_TOR_DIFFUSE);
@ -509,8 +514,14 @@ void AIS_Dimension::DrawText (const Handle(Prs3d_Presentation)& thePresentation,
} }
else else
{ {
// setting color for text // Setting color for text
if (!myDrawer->HasOwnFreeBoundaryAspect())
{
myDrawer->SetFreeBoundaryAspect (new Prs3d_LineAspect (aColor, Aspect_TOL_SOLID, 1.0));
}
myDrawer->FreeBoundaryAspect()->Aspect()->SetColor (aColor); myDrawer->FreeBoundaryAspect()->Aspect()->SetColor (aColor);
// drawing text // drawing text
StdPrs_WFShape::Add (thePresentation, aTextShape, myDrawer); StdPrs_WFShape::Add (thePresentation, aTextShape, myDrawer);
} }