Salome HOME
Copyright update 2020
[modules/shaper.git] / src / SketcherPrs / SketcherPrs_SymbolPrs.cpp
index d88e2bb71e56ce44425c698355595e275301c5ff..b35b7acfafd2b60cbce9dd8655c6e9753e1d5a4d 100644 (file)
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        SketcherPrs_SymbolPrs.cpp
-// Created:     12 March 2015
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "SketcherPrs_SymbolPrs.h"
 #include "SketcherPrs_Tools.h"
@@ -12,6 +25,8 @@
 #include <GeomAPI_Vertex.h>
 #include <GeomAPI_Curve.h>
 
+#include <ModelAPI_Tools.h>
+
 #include <Events_InfoMessage.h>
 
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
 #include <StdPrs_Point.hxx>
 #include <StdPrs_Curve.hxx>
+#include <Prs3d_LineAspect.hxx>
 
 #include <OpenGl_Element.hxx>
 #include <OpenGl_GraphicDriver.hxx>
 #include <OpenGl_Context.hxx>
 #include <OpenGl_View.hxx>
-#include <OpenGl_PointSprite.hxx>
-#include <OpenGl_VertexBuffer.hxx>
-#include <OpenGl_ShaderManager.hxx>
+#include <OpenGl_Group.hxx>
 
 #ifdef WIN32
 # define FSEP "\\"
 #endif
 
 /// Step between icons
-static const double MyDist = 0.02;
-
-/// Function to convert opengl data type
-GLenum toGlDataType (const Graphic3d_TypeOfData theType, GLint& theNbComp)
-{
-  switch (theType) {
-    case Graphic3d_TOD_USHORT:
-      theNbComp = 1;
-      return GL_UNSIGNED_SHORT;
-    case Graphic3d_TOD_UINT:
-      theNbComp = 1;
-      return GL_UNSIGNED_INT;
-    case Graphic3d_TOD_VEC2:
-      theNbComp = 2;
-      return GL_FLOAT;
-    case Graphic3d_TOD_VEC3:
-      theNbComp = 3;
-      return GL_FLOAT;
-    case Graphic3d_TOD_VEC4:
-      theNbComp = 4;
-      return GL_FLOAT;
-    case Graphic3d_TOD_VEC4UB:
-      theNbComp = 4;
-      return GL_UNSIGNED_BYTE;
-  }
-  theNbComp = 0;
-  return GL_NONE;
-}
+static const double MyDist = 0.015;
 
 
-//*******************************************************************
-//! Auxiliary class for Vertex buffer with interleaved attributes.
-class SketcherPrs_VertexBuffer : public OpenGl_VertexBuffer
+//**************************************************************
+//! Redefinition of OpenGl_Element
+class SketcherPrs_SymbolArray: public OpenGl_PrimitiveArray
 {
-
 public:
+  SketcherPrs_SymbolArray(const OpenGl_GraphicDriver* theDriver,
+    const Handle(SketcherPrs_SymbolPrs)& theObj, const Handle(AIS_InteractiveContext)& theCtx)
+    :OpenGl_PrimitiveArray(theDriver, theObj->myPntArray->Type(), theObj->myPntArray->Indices(),
+    theObj->myPntArray->Attributes(), theObj->myPntArray->Bounds()), myObj(theObj),
+    myContext(theCtx) {}
 
-  //! Create uninitialized VBO..
-  //! \param theAttribs attributes
-  //! \param theStride a flag
-  SketcherPrs_VertexBuffer (const Graphic3d_Attribute* theAttribs,
-                        const Standard_Integer     theStride)
-  : Stride (theStride), NbAttributes(1)
+  virtual void Render(const Handle(OpenGl_Workspace)& theWorkspace) const
   {
-
-    memcpy (Attribs, theAttribs, sizeof(Graphic3d_Attribute) * NbAttributes);
-  }
-
-  //! Create uninitialized VBO.
-  SketcherPrs_VertexBuffer (const Graphic3d_Buffer& theAttribs)
-  : Stride (theAttribs.Stride), NbAttributes(1)
-  {
-    memcpy (Attribs, theAttribs.AttributesArray(), sizeof(Graphic3d_Attribute) * NbAttributes);
-  }
-
-  /// Returns True if color attribute is defined
-  virtual bool HasColorAttribute() const
-  {
-    for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) {
-      const Graphic3d_Attribute& anAttrib = Attribs[anAttribIter];
-      if (anAttrib.Id == Graphic3d_TOA_COLOR) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /// Returns True if normal attribute is defined
-  virtual bool HasNormalAttribute() const
-  {
-    for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) {
-      const Graphic3d_Attribute& anAttrib = Attribs[anAttribIter];
-      if (anAttrib.Id == Graphic3d_TOA_NORM) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /// Bind position of the attribute
-  /// \param theGlCtx OpenGl context
-  virtual void BindPositionAttribute (const Handle(OpenGl_Context)& theGlCtx) const
-  {
-    if (!OpenGl_VertexBuffer::IsValid()) {
-      return;
-    }
-
-    OpenGl_VertexBuffer::Bind (theGlCtx);
-    GLint aNbComp;
-    const GLubyte* anOffset = OpenGl_VertexBuffer::myOffset;
-    for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) {
-      const Graphic3d_Attribute& anAttrib = Attribs[anAttribIter];
-      const GLenum   aDataType = toGlDataType (anAttrib.DataType, aNbComp);
-      if (aDataType == GL_NONE) {
-        continue;
-      } else if (anAttrib.Id == Graphic3d_TOA_POS) {
-        OpenGl_VertexBuffer::bindAttribute(theGlCtx, Graphic3d_TOA_POS, aNbComp,
-                                           aDataType, Stride, anOffset);
-        break;
+    ModelAPI_Feature* aConstraint = myObj->feature();
+    if (aConstraint->data().get() && aConstraint->data()->isValid()) {
+      Handle(OpenGl_View) aView = theWorkspace->View();
+      double aScale = aView->Camera()->Scale();
+      // Update points coordinate taking the viewer scale into account
+      myObj->updateIfReadyToDisplay(MyDist * aScale, myObj->myIsCustomColor);
+      if (myIsVboInit) {
+        if (myVboAttribs) {
+          const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext();
+          Handle(Graphic3d_Buffer) aAttr = myObj->myPntArray->Attributes();
+          myVboAttribs->init(aCtx, 0, aAttr->NbElements,
+                             aAttr->Data(), GL_NONE, aAttr->Stride);
+        } else
+          myIsVboInit = false;
+      } else {
+        myAttribs = myObj->myPntArray->Attributes();
+        myIndices = myObj->myPntArray->Indices();
+        myBounds = myObj->myPntArray->Bounds();
       }
-
-      anOffset += Graphic3d_Attribute::Stride (anAttrib.DataType);
     }
-  }
-
-  /// Bind all attributes
-  /// \param theGlCtx OpenGl context
-  virtual void BindAllAttributes (const Handle(OpenGl_Context)& theGlCtx) const
-  {
-    if (!OpenGl_VertexBuffer::IsValid())
-      return;
-
-    OpenGl_VertexBuffer::Bind (theGlCtx);
-    GLint aNbComp;
-    const GLubyte* anOffset = OpenGl_VertexBuffer::myOffset;
-    for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter)
-    {
-      const Graphic3d_Attribute& anAttrib = Attribs[anAttribIter];
-      const GLenum   aDataType = toGlDataType (anAttrib.DataType, aNbComp);
-      if (aDataType == GL_NONE)
-        continue;
-
-      OpenGl_VertexBuffer::bindAttribute(theGlCtx, anAttrib.Id, aNbComp,
-                                         aDataType, Stride, anOffset);
-      anOffset += Graphic3d_Attribute::Stride (anAttrib.DataType);
-    }
-  }
+    OpenGl_PrimitiveArray::Render(theWorkspace);
 
-  /// Unbind all attributes
-  /// \param theGlCtx OpenGl context
-  virtual void UnbindAllAttributes (const Handle(OpenGl_Context)& theGlCtx) const
-  {
-    if (!OpenGl_VertexBuffer::IsValid())
-      return;
-    OpenGl_VertexBuffer::Unbind (theGlCtx);
-
-    for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) {
-      const Graphic3d_Attribute& anAttrib = Attribs[anAttribIter];
-      OpenGl_VertexBuffer::unbindAttribute (theGlCtx, anAttrib.Id);
+    // Update selection position only if there is no selected object
+    // because it can corrupt selection of other objects
+    if (myContext->NbSelected() == 0)  {
+      myContext->MainSelector()->RebuildSensitivesTree(myObj);
+      myContext->MainSelector()->RebuildObjectsTree (false);
     }
   }
 
-public:
-
-  /// Array of attributes
-  Graphic3d_Attribute Attribs[1];
-
-  /// A flag
-  Standard_Integer    Stride;
-
-  /// Number of attributes
-  Standard_Integer NbAttributes;
-};
-
-//**************************************************************
-//! Redefinition of OpenGl_Element
-class SketcherPrs_Element: public OpenGl_Element
-{
-public:
-  /// Constructor
-  /// \param theObj a presentation
-  SketcherPrs_Element(const Handle(SketcherPrs_SymbolPrs)& theObj) :
-  OpenGl_Element(), myObj(theObj) {}
-
-  /// Render the current presentation
-  /// \param theWorkspace OpenGL workspace
-  virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const
-  {
-    if (!myObj.IsNull())
-      myObj->Render(theWorkspace);
-  }
-
-  /// Releases OpenGL resources
-  /// \param theContext OpenGL context
-  virtual void Release (OpenGl_Context* theContext)
-  {
-    if (!myObj.IsNull())
-      myObj->Release(theContext);
-  }
-
 private:
   Handle(SketcherPrs_SymbolPrs) myObj;
+  Handle(AIS_InteractiveContext) myContext;
 };
 
 
-//**************************************************************
-//! Definition of call back
-OpenGl_Element* SymbolPrsCallBack(const CALL_DEF_USERDRAW * theUserDraw)
-{
-  Handle(SketcherPrs_SymbolPrs) anIObj = (SketcherPrs_SymbolPrs*)theUserDraw->Data;
-  if (anIObj.IsNull()) {
-    std::cout <<
-      "VUserDrawCallback error: null object passed, the custom scene element will not be rendered"
-      << std::endl;
-  }
-  return new SketcherPrs_Element(anIObj);
-}
-
-
 //*****************************************************************************
-IMPLEMENT_STANDARD_HANDLE(SketcherPrs_SymbolPrs, AIS_InteractiveObject);
 IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_SymbolPrs, AIS_InteractiveObject);
 
 
@@ -252,25 +118,44 @@ std::map<const char*, Handle(Image_AlienPixMap)> SketcherPrs_SymbolPrs::myIconsM
 
 
 SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint,
-                                             const std::shared_ptr<GeomAPI_Ax3>& thePlane)
- : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane), myIsConflicting(false)
+  SketchPlugin_Sketch* theSketcher)
+ : AIS_InteractiveObject(), myConstraint(theConstraint),
+   myIsCustomColor(false),
+   mySketcher(theSketcher)
 {
   SetAutoHilight(Standard_False);
-  myPntArray = new Graphic3d_ArrayOfPoints(1);
-  myPntArray->AddVertex(0., 0., 0.);
 }
 
+//*********************************************************************************
 SketcherPrs_SymbolPrs::~SketcherPrs_SymbolPrs()
 {
   SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
   // Empty memory in position manager
   aMgr->deleteConstraint(this);
+
+  Handle(Prs3d_Presentation) aSelPrs =
+    GetSelectPresentation(Handle(PrsMgr_PresentationManager3d)());
+  if (!aSelPrs.IsNull()) {
+      if (!aSelPrs->Groups().IsEmpty()) {
+        aSelPrs->Clear();
+      }
+      aSelPrs->Erase();
+  }
+  Handle(Prs3d_Presentation) aHilightPrs =
+    GetHilightPresentation(Handle(PrsMgr_PresentationManager3d)());
+  if (!aHilightPrs.IsNull()) {
+    if (!aHilightPrs->Groups().IsEmpty()) {
+      aHilightPrs->Clear();
+    }
+    aHilightPrs->Erase();
+  }
 }
 
 #ifdef _WINDOWS
 #pragma warning( disable : 4996 )
 #endif
 
+//*********************************************************************************
 Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
 {
   if (myIconsMap.count(iconName()) == 1) {
@@ -283,7 +168,7 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
     aFile = std::string(anEnv) +
       FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper";
   } else {
-    anEnv = getenv("OPENPARTS_ROOT_DIR");
+    anEnv = getenv("CADBUILDER_ROOT_DIR");
     if (anEnv)
       aFile = std::string(anEnv) + FSEP + "resources";
   }
@@ -292,17 +177,31 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
   aFile += iconName();
   Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap();
   if (aPixMap->Load(aFile.c_str())) {
+    int aRatio = SketcherPrs_Tools::pixelRatio();
+    if (aRatio > 1) {
+      Handle(Image_AlienPixMap) aSizedMap = new Image_AlienPixMap();
+      Standard_Size aWidth = aPixMap->Width() * aRatio;
+      Standard_Size aHeigh = aPixMap->Height() * aRatio;
+      aSizedMap->InitTrash(aPixMap->Format(), aWidth, aHeigh);
+      for (Standard_Size i = 0; i < aWidth; i++) {
+        for (Standard_Size j = 0; j < aHeigh; j++) {
+          aSizedMap->SetPixelColor(int(i), int(j), aPixMap->PixelColor(i / aRatio, j / aRatio));
+        }
+      }
+      aPixMap = aSizedMap;
+    }
     myIconsMap[iconName()] = aPixMap;
     return aPixMap;
   }
   // The icon for constraint is not found
   static const char aMsg[] = "Error! constraint images are not found";
-  cout<<aMsg<<endl;
+  std::cout<<aMsg<<std::endl;
   Events_InfoMessage("SketcherPrs_SymbolPrs", aMsg).send();
   myIconsMap[iconName()] = Handle(Image_AlienPixMap)();
   return Handle(Image_AlienPixMap)();
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::prepareAspect()
 {
   // Create an aspect with the icon
@@ -312,9 +211,12 @@ void SketcherPrs_SymbolPrs::prepareAspect()
       myAspect = new Graphic3d_AspectMarker3d();
     else
       myAspect = new Graphic3d_AspectMarker3d(aIcon);
+
+    myAspect->SetColor(myCustomColor);
   }
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup,
                                     std::string theAttrName) const
 {
@@ -326,6 +228,8 @@ void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup,
 
   std::shared_ptr<GeomAPI_Pnt> aPnt1 = aEdge->firstPoint();
   std::shared_ptr<GeomAPI_Pnt> aPnt2 = aEdge->lastPoint();
+  gp_Pnt aP1 = aPnt1->impl<gp_Pnt>();
+  gp_Pnt aP2 = aPnt2->impl<gp_Pnt>();
 
   // Draw line by two points
   Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments(2, 1);
@@ -334,55 +238,58 @@ void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup,
   theGroup->AddPrimitiveArray(aLines);
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM,
-                                           const SelectMgr_SequenceOfOwner& theOwners)
+                                            const SelectMgr_SequenceOfOwner& theOwners)
 {
-
   Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM );
   aSelectionPrs->Clear();
-  drawLines(aSelectionPrs, Quantity_NOC_WHITE);
+  drawLines(aSelectionPrs, GetContext()->SelectionStyle()->Color());
 
   aSelectionPrs->SetDisplayPriority(9);
   aSelectionPrs->Display();
-  thePM->Highlight(this);
+  thePM->Color(this, GetContext()->SelectionStyle());
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::HilightOwnerWithColor(
-  const Handle(PrsMgr_PresentationManager3d)& thePM,
-  const Quantity_NameOfColor theColor,
-  const Handle(SelectMgr_EntityOwner)& theOwner)
+                                  const Handle(PrsMgr_PresentationManager3d)& thePM,
+                                  const Handle(Prs3d_Drawer)& theStyle,
+                                  const Handle(SelectMgr_EntityOwner)& theOwner)
 {
-  thePM->Color(this, theColor);
+  thePM->Color(this, theStyle);
 
   Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM );
   aHilightPrs->Clear();
-  drawLines(aHilightPrs, theColor);
+  drawLines(aHilightPrs, theStyle->Color());
+  aHilightPrs->SetZLayer(Graphic3d_ZLayerId_Topmost);
 
   if (thePM->IsImmediateModeOn())
     thePM->AddToImmediateList(aHilightPrs);
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::Compute(
-  const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
-  const Handle(Prs3d_Presentation)& thePresentation,
-  const Standard_Integer theMode)
+                const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+                const Handle(Prs3d_Presentation)& thePresentation,
+                const Standard_Integer theMode)
 {
+  if (!plane().get())
+    return;
   // Create an icon
   prepareAspect();
 
   Handle(AIS_InteractiveContext) aCtx = GetContext();
   Handle(OpenGl_GraphicDriver) aDriver =
     Handle(OpenGl_GraphicDriver)::DownCast(aCtx->CurrentViewer()->Driver());
-  if (!aDriver.IsNull()) {
-    // register the custom element factory function
-    aDriver->UserDrawCallback() = SymbolPrsCallBack;
-  }
+  if (aDriver.IsNull())
+    return;
 
   // Update points with default shift value
   // it updates array of points if the presentation is ready to display, or the array of points
   // contains the previous values
 
-  bool aReadyToDisplay = updateIfReadyToDisplay(20);
+  bool aReadyToDisplay = updateIfReadyToDisplay(20, myIsCustomColor);
 
   int aNbVertex = myPntArray->VertexNumber();
   if (myOwner.IsNull()) {
@@ -394,9 +301,12 @@ void SketcherPrs_SymbolPrs::Compute(
   for (int i = 1; i <= aNbVertex; i++) {
     Handle(SketcherPrs_SensitivePoint) aSP = new SketcherPrs_SensitivePoint(myOwner, i);
     mySPoints.Append(aSP);
+    if (myIsCustomColor)
+      myPntArray->SetVertexColor(i, myCustomColor);
   }
 
-  Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePresentation);
+  Handle(OpenGl_Group) aGroup =
+    Handle(OpenGl_Group)::DownCast(Prs3d_Root::CurrentGroup (thePresentation));
   aGroup->SetPrimitivesAspect(myAspect);
 
   // Recompute boundary box of the group
@@ -405,15 +315,16 @@ void SketcherPrs_SymbolPrs::Compute(
   aBnd.Clear();
   for (int i = 1; i <= myPntArray->ItemNumber(); i++) {
     aVert = myPntArray->Vertice(i);
-    aBnd.Add (Graphic3d_Vec4((float)aVert.X(), (float)aVert.Y(), (float)aVert.Z(), 1.0f));
+    aBnd.Add(Graphic3d_Vec4((float)aVert.X(), (float)aVert.Y(), (float)aVert.Z(), 1.0f));
   }
 
   // Pint the group with custom procedure (see Render)
-  aGroup->UserDraw(this, true);
+  SketcherPrs_SymbolArray* aElem =
+    new SketcherPrs_SymbolArray((OpenGl_GraphicDriver*)aDriver->This(), this, GetContext());
+  aGroup->AddElement(aElem);
 
   // Disable frustum culling for this object by marking it as mutable
   aGroup->Structure()->SetMutable(true);
-  //aGroup->AddPrimitiveArray(myPntArray);
 
   if (!aReadyToDisplay)
     SketcherPrs_Tools::sendEmptyPresentationError(myConstraint,
@@ -421,7 +332,7 @@ void SketcherPrs_SymbolPrs::Compute(
 }
 
 
-
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
                                              const Standard_Integer aMode)
 {
@@ -432,134 +343,45 @@ void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)&
   }
 }
 
-void SketcherPrs_SymbolPrs::SetConflictingConstraint(const bool& theConflicting,
-                                                     const std::vector<int>& theColor)
+//*********************************************************************************
+void SketcherPrs_SymbolPrs::SetCustomColor(const std::vector<int>& theColor)
 {
-  if (theConflicting)
-  {
-    if (!myAspect.IsNull())
-      myAspect->SetColor (Quantity_Color (theColor[0] / 255., theColor[1] / 255.,
-                          theColor[2] / 255., Quantity_TOC_RGB));
-    myIsConflicting = true;
-  }
+  myIsCustomColor = !theColor.empty();
+  if (myIsCustomColor)
+    myCustomColor = Quantity_Color(theColor[0] / 255., theColor[1] / 255.,
+                                   theColor[2] / 255., Quantity_TOC_RGB);
   else
-  {
-    if (!myAspect.IsNull())
-      myAspect->SetColor (Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB));
-    myIsConflicting = false;
-  }
-}
-
-void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) const
-{
-  // this method is a combination of OCCT OpenGL functions. The main purpose is to have
-  // equal distance from the source object to symbol indpendently of zoom.
-  // It is base on OCCT 6.9.1 and might need changes when using later OCCT versions.
-  // The specific SHAPER modifications are marked by ShaperModification:start/end,
-  // other is OCCT code
-
-  // do not update presentation for invalid or already removed objects: the presentation
-  // should be removed soon
-  if (!myConstraint->data().get() || !myConstraint->data()->isValid())
-    return;
-
-  const OpenGl_AspectMarker* anAspectMarker = theWorkspace->AspectMarker(Standard_True);
-  const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext();
-  Handle(OpenGl_View) aView = theWorkspace->ActiveView();
-
-  // ShaperModification:start
-  double aScale = aView->Camera()->Scale();
-  // Update points coordinate taking the viewer scale into account
-  updateIfReadyToDisplay(MyDist * aScale);
+    myCustomColor = Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB);
 
-  // ShaperModification:end
+  if (!myAspect.IsNull())
+    myAspect->SetColor (myCustomColor);
 
-  Handle(Graphic3d_Buffer) aAttribs = myPntArray->Attributes();
-
-  if (myVboAttribs.IsNull()) {
-    myVboAttribs = new SketcherPrs_VertexBuffer(*aAttribs);
-  }
-
-  // Update drawing attributes
-  if (!myVboAttribs->init(aCtx, 0, aAttribs->NbElements,
-                          aAttribs->Data(), GL_NONE, aAttribs->Stride)) {
-    myVboAttribs->Release (aCtx.operator->());
-    myVboAttribs.Nullify();
-    return;
-  }
-
-  Handle(OpenGl_Texture) aTextureBack = theWorkspace->DisableTexture();
-
-  const Handle(OpenGl_PointSprite)& aSpriteNorm = anAspectMarker->SpriteRes(aCtx);
-
-  if (!aSpriteNorm.IsNull() && !aSpriteNorm->IsDisplayList()) {
-    // ShaperModification:start : filling the presentation with color if there is a conflict
-    const bool toHilight =
-      (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) != 0 || myIsConflicting;
-    // ShaperModification:end
-
-    const Handle(OpenGl_PointSprite)& aSprite =
-      (toHilight && anAspectMarker->SpriteHighlightRes(aCtx)->IsValid())?
-                                              anAspectMarker->SpriteHighlightRes(aCtx)
-                                              : aSpriteNorm;
-    theWorkspace->EnableTexture (aSprite);
-    aCtx->ShaderManager()->BindProgram(anAspectMarker, aSprite, Standard_False,
-                                       Standard_False, anAspectMarker->ShaderProgramRes(aCtx));
-    const TEL_COLOUR* aLineColor  =  &anAspectMarker->Color();
-    if (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT)
-      aLineColor = theWorkspace->HighlightColor;
-
-    // Set lighting of the symbol
-    if (toHilight)
-      aCtx->core11fwd->glDisable (GL_LIGHTING);
-    else
-      aCtx->core11fwd->glEnable (GL_LIGHTING);
-
-    aCtx->SetColor4fv(*(const OpenGl_Vec4* )(aLineColor->rgb));
-
-
-    myVboAttribs->BindAllAttributes(aCtx);
-    // Textured markers will be drawn with the point sprites
-    aCtx->SetPointSize (anAspectMarker->MarkerSize());
-    aCtx->core11fwd->glEnable (GL_ALPHA_TEST);
-    aCtx->core11fwd->glAlphaFunc (GL_GEQUAL, 0.1f);
-
-    aCtx->core11fwd->glEnable (GL_BLEND);
-    aCtx->core11fwd->glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    aCtx->core11fwd->glDrawArrays (0, 0, myVboAttribs->GetElemsNb());
-
-    aCtx->core11fwd->glDisable (GL_BLEND);
-    aCtx->core11fwd->glDisable (GL_ALPHA_TEST);
-    aCtx->SetPointSize (1.0f);
-  }
-  theWorkspace->EnableTexture (aTextureBack);
-  aCtx->BindProgram (NULL);
-
-  // Update selection position only if there is no selected object
-  // because it can corrupt selection of other objects
-  if ((GetContext()->NbCurrents() == 0) && (GetContext()->NbSelected() == 0))
-  {
-    GetContext()->MainSelector()->RebuildSensitivesTree (this);
-    GetContext()->MainSelector()->RebuildObjectsTree (false);
-  }
-}
-
-
-void SketcherPrs_SymbolPrs::Release (OpenGl_Context* theContext)
-{
-  // Release OpenGl resources
-  if (!myVboAttribs.IsNull()) {
-    if (theContext) {
-      theContext->DelayedRelease (myVboAttribs);
+  Handle(Prs3d_Presentation) aPrs = Presentation();
+  if (!aPrs.IsNull()) {
+    if (myIsCustomColor) {
+      Handle(Graphic3d_PresentationAttributes) aAttr = new Graphic3d_PresentationAttributes();
+      aAttr->SetColor(myCustomColor);
+      aPrs->Highlight(aAttr);
+    }
+    else {
+      aPrs->UnHighlight();
     }
-    myVboAttribs.Nullify();
   }
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr<GeomAPI_Shape>& theShape,
-                                      const Handle(Prs3d_Presentation)& thePrs) const
+                                      const Handle(Prs3d_Presentation)& thePrs,
+                                      Quantity_Color theColor) const
 {
+  Handle(Graphic3d_AspectLine3d) aLineAspect =
+    new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
+
+  Handle(Prs3d_LineAspect) aLinesStyle = myDrawer->LineAspect();
+  Handle(Graphic3d_AspectLine3d) aOldStyle = aLinesStyle->Aspect();
+  aLinesStyle->SetAspect(aLineAspect);
+  myDrawer->SetLineAspect(aLinesStyle);
+
   if (theShape->isEdge()) {
     // The shape is edge
     std::shared_ptr<GeomAPI_Curve> aCurve =
@@ -583,11 +405,15 @@ void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr<GeomAPI_Shape>& theS
     Handle(Geom_CartesianPoint) aPoint = new Geom_CartesianPoint(aPnt->impl<gp_Pnt>());
     StdPrs_Point::Add(thePrs, aPoint, myDrawer);
   }
+
+  aLinesStyle->SetAspect(aOldStyle);
+  myDrawer->SetLineAspect(aLinesStyle);
 }
 
+//*********************************************************************************
 void SketcherPrs_SymbolPrs::drawListOfShapes(
-  const std::shared_ptr<ModelAPI_AttributeRefList>& theListAttr,
-  const Handle(Prs3d_Presentation)& thePrs) const
+                      const std::shared_ptr<ModelAPI_AttributeRefList>& theListAttr,
+                      const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
 {
   int aNb = theListAttr->size();
   if (aNb == 0)
@@ -598,11 +424,12 @@ void SketcherPrs_SymbolPrs::drawListOfShapes(
     aObj = theListAttr->object(i);
     std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(aObj);
     if (aShape.get() != NULL)
-      drawShape(aShape, thePrs);
+      drawShape(aShape, thePrs, theColor);
   }
 }
 
-void SketcherPrs_SymbolPrs::BoundingBox (Bnd_Box& theBndBox)
+//*********************************************************************************
+void SketcherPrs_SymbolPrs::BoundingBox(Bnd_Box& theBndBox)
 {
   Select3D_BndBox3d aTmpBox;
   for (Select3D_EntitySequenceIter aPntIter (mySPoints); aPntIter.More(); aPntIter.Next()) {
@@ -613,4 +440,3 @@ void SketcherPrs_SymbolPrs::BoundingBox (Bnd_Box& theBndBox)
   theBndBox.Update (aTmpBox.CornerMin().x(), aTmpBox.CornerMin().y(), aTmpBox.CornerMin().z(),
                     aTmpBox.CornerMax().x(), aTmpBox.CornerMax().y(), aTmpBox.CornerMax().z());
 }
-