From 1344a93905f69f561a5864786ef471fb8e21d1c2 Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 13 Mar 2015 15:55:24 +0300 Subject: [PATCH] INT PAL 0052631: Line width property does not affect Shading with edges display mode --- src/GEOMGUI/GEOM_Displayer.cxx | 3 ++- src/OBJECT/GEOM_AISShape.cxx | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index cd54ac147..24f2c017c 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -839,11 +839,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // display mode from properties propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); - // - face boundaries color + // - face boundaries color and line width if( AISShape->DisplayMode() == GEOM_AISShape::ShadingWithEdges ) AISShape->Attributes()->SetFaceBoundaryDraw( Standard_True ); anAspect = AISShape->Attributes()->FaceBoundaryAspect(); anAspect->SetColor( SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::OutlineColor ) ).value() ) ); + anAspect->SetWidth( propMap.value( GEOM::propertyName( GEOM::LineWidth ) ).toInt() ); AISShape->Attributes()->SetFaceBoundaryAspect( anAspect ); // set display vectors flag diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 926c486a2..87838da18 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -257,12 +257,8 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent shadingMode(aPresentationManager, aPrs, Shading); if( anIsColorField && myFieldDimension == 1 ) drawField( aPrs ); - else { + else myDrawer->SetFaceBoundaryDraw( Standard_True ); - Handle(Prs3d_LineAspect) aBoundaryAspect = - new Prs3d_LineAspect ( myEdgesInShadingColor, Aspect_TOL_SOLID, myOwnWidth ); - myDrawer->SetFaceBoundaryAspect (aBoundaryAspect); - } break; } case TexturedShape: -- 2.39.2