updated copyright message

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_Coincident.cpp

diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp
index c123960a59a9cc91c36655a5f4ef54ffb485fe61..0e148e0670c7be84402fbbc755f7b50dd269820c 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Coincident.cpp
+++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "SketcherPrs_Coincident.h"
@@ -35,10 +34,10 @@
 #include <SketchPlugin_Constraint.h>
 #include <SketchPlugin_ConstraintCoincidence.h>
 
+#include <AIS_InteractiveContext.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Prs3d_PointAspect.hxx>
-#include <Prs3d_Root.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
 #include <Select3D_SensitivePoint.hxx>
@@ -49,8 +48,9 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Coincident, AIS_InteractiveObject);
 SketcherPrs_Coincident::SketcherPrs_Coincident(ModelAPI_Feature* theConstraint,
   SketchPlugin_Sketch* theSketch)
 : AIS_InteractiveObject(), myConstraint(theConstraint), mySketch(theSketch),
-  myPoint(gp_Pnt(0.0, 0.0, 0.0)), myIsCustomColor(false)
+  myPoint(gp_Pnt(0.0, 0.0, 0.0))
 {
+  SetColor(Quantity_NOC_BLACK);
 }
 
 bool SketcherPrs_Coincident::IsReadyToDisplay(ModelAPI_Feature* theConstraint,
@@ -110,9 +110,9 @@ bool hasEdge(ModelAPI_Feature* theConstraint)
 
 
 void SketcherPrs_Coincident::Compute(
-  const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
   const Handle(Prs3d_Presentation)& thePresentation,
-  const Standard_Integer theMode)
+  const Standard_Integer /*theMode*/)
 {
   gp_Pnt aPoint;
   bool aReadyToDisplay = readyToDisplay(myConstraint, mySketch->coordinatePlane(), aPoint);
@@ -138,18 +138,21 @@ void SketcherPrs_Coincident::Compute(
       }
     }
   }
-  Quantity_Color aExternalColor = aIsEdge ? Quantity_NOC_BLACK : Quantity_NOC_YELLOW;
-  Quantity_Color aInternalColor = aIsEdge ? Quantity_NOC_YELLOW : Quantity_NOC_BLACK;
+  Quantity_Color aMainColor;
+  Color(aMainColor);
+  Quantity_Color aExternalColor = aIsEdge ? aMainColor : Quantity_NOC_YELLOW;
+  Quantity_Color aInternalColor = aIsEdge ? Quantity_NOC_YELLOW : aMainColor;
+
+  int aRatio = SketcherPrs_Tools::pixelRatio();
 
   // Create the presentation as a combination of standard point markers
-  bool aCustomColor = myIsCustomColor;
   // The external yellow contour
   Handle(Graphic3d_AspectMarker3d) aPtA = new Graphic3d_AspectMarker3d();
   aPtA->SetType(Aspect_TOM_RING3);
-  aPtA->SetScale(2.);
-  aPtA->SetColor(!aCustomColor ? aExternalColor : myCustomColor);
+  aPtA->SetScale(2. * aRatio);
+  aPtA->SetColor(aExternalColor);
 
-  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation);
+  Handle(Graphic3d_Group) aGroup = thePresentation->CurrentGroup();
   aGroup->SetPrimitivesAspect(aPtA);
   Handle(Graphic3d_ArrayOfPoints) aPntArray = new Graphic3d_ArrayOfPoints(1);
   aPntArray->AddVertex (myPoint.X(), myPoint.Y(), myPoint.Z());
@@ -158,16 +161,16 @@ void SketcherPrs_Coincident::Compute(
   // Make a black mid ring
   aPtA = new Graphic3d_AspectMarker3d();
   aPtA->SetType(aIsEdge ? Aspect_TOM_STAR : Aspect_TOM_RING1);
-  aPtA->SetScale(1.);
-  aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor);
+  aPtA->SetScale(1. * aRatio);
+  aPtA->SetColor(aInternalColor);
   aGroup->SetPrimitivesAspect(aPtA);
   aGroup->AddPrimitiveArray (aPntArray);
 
   // Make an internal ring
   aPtA = new Graphic3d_AspectMarker3d();
   aPtA->SetType(Aspect_TOM_POINT);
-  aPtA->SetScale(5.);
-  aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor);
+  aPtA->SetScale(5. * aRatio);
+  aPtA->SetColor(aInternalColor);
   aGroup->SetPrimitivesAspect(aPtA);
   aGroup->AddPrimitiveArray (aPntArray);
 
@@ -177,28 +180,8 @@ void SketcherPrs_Coincident::Compute(
 }
 
 
-void SketcherPrs_Coincident::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                            const Standard_Integer aMode)
+void SketcherPrs_Coincident::ComputeSelection(const Handle(SelectMgr_Selection)& /*theSelection*/,
+                                              const Standard_Integer /*theMode*/)
 {
   // There is no selection of coincident - a point is selected instead of coincidence
 }
-
-void SketcherPrs_Coincident::SetColor(const Quantity_NameOfColor aCol)
-{
-  SetColor(Quantity_Color(aCol));
-}
-
-void SketcherPrs_Coincident::SetColor(const Quantity_Color &aCol)
-{
-  hasOwnColor=Standard_True;
-}
-
-void SketcherPrs_Coincident::SetCustomColor(const std::vector<int>& theColor)
-{
-  myIsCustomColor = !theColor.empty();
-  if (myIsCustomColor)
-    myCustomColor = Quantity_Color(theColor[0] / 255., theColor[1] / 255.,
-                                   theColor[2] / 255., Quantity_TOC_RGB);
-  else
-    myCustomColor = Quantity_Color();
-}