From c5ff8edb16d5a01bca8fabf852831bab5d466f04 Mon Sep 17 00:00:00 2001 From: vsv Date: Thu, 22 Dec 2016 11:52:10 +0300 Subject: [PATCH] Porting on SALOME 8.2.0 --- src/ModuleBase/ModuleBase_ResultPrs.h | 7 +++---- src/PartSet/PartSet_ResultSketchPrs.cpp | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ModuleBase/ModuleBase_ResultPrs.h b/src/ModuleBase/ModuleBase_ResultPrs.h index fe988d3b6..19a84f59a 100644 --- a/src/ModuleBase/ModuleBase_ResultPrs.h +++ b/src/ModuleBase/ModuleBase_ResultPrs.h @@ -38,13 +38,12 @@ public: /// Highlight the presentation with the given color /// \param aPM a presentations manager - /// \param aCol a color + /// \param theStyle a style of presentation /// \param aMode a drawing mode virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& aPM, - const Quantity_NameOfColor aCol, const Standard_Integer aMode = 0) + const Handle(Graphic3d_HighlightStyle)& theStyle, const Standard_Integer aMode = 0) { - //PORTING_TO_SALOME_8 - //Selectable()->HilightOwnerWithColor(aPM, aCol, this); + Selectable()->HilightOwnerWithColor(aPM, theStyle, this); } DEFINE_STANDARD_RTTIEXT(ModuleBase_BRepOwner, StdSelect_BRepOwner) diff --git a/src/PartSet/PartSet_ResultSketchPrs.cpp b/src/PartSet/PartSet_ResultSketchPrs.cpp index 029c21bb6..3a7e52a97 100755 --- a/src/PartSet/PartSet_ResultSketchPrs.cpp +++ b/src/PartSet/PartSet_ResultSketchPrs.cpp @@ -226,15 +226,13 @@ void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxilia if (aDrawer->HasOwnWireAspect()) { aLineAspect = aDrawer->WireAspect(); } - Quantity_Color aCurrentColor; - Aspect_TypeOfLine aPrevLineType; - Standard_Real aCurrentWidth; - // PORTING_TO_SALOME_8 - /*aLineAspect->Aspect()->Values(aCurrentColor, aPrevLineType, aCurrentWidth); + Quantity_Color aCurrentColor = aLineAspect->Aspect()->Color(); + Aspect_TypeOfLine aPrevLineType = aLineAspect->Aspect()->Type(); + Standard_Real aCurrentWidth = aLineAspect->Aspect()->Width(); bool isChangedLineType = aType != aPrevLineType; if (isChangedLineType) { aLineAspect->SetTypeOfLine(aType); - }*/ + } } void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape, -- 2.39.2