From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 22 Dec 2016 08:52:10 +0000 (+0300)
Subject: Porting on SALOME 8.2.0
X-Git-Tag: V_2.7.0~351^2~55^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c5ff8edb16d5a01bca8fabf852831bab5d466f04;p=modules%2Fshaper.git

Porting on SALOME 8.2.0
---

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,