From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 21 May 2015 16:21:35 +0000 (+0300)
Subject: Make coincidence constraint of black-yellow color
X-Git-Tag: V_1.2.0~121
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=014d4b2f63b6f239da5259bc700e1dcbeb49897e;p=modules%2Fshaper.git

Make coincidence constraint of black-yellow color
---

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
index ce8fa25de..4f5110400 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
@@ -36,9 +36,9 @@ AISObjectPtr SketchPlugin_ConstraintCoincidence::getAISObject(AISObjectPtr thePr
   AISObjectPtr anAIS = thePrevious;
   if (!anAIS) {
     anAIS = SketcherPrs_Factory::coincidentConstraint(this, sketch()->coordinatePlane());
-  std::vector<int> aRGB = Config_PropManager::color("Visualization", "sketch_constraint_color",
-                                                    SKETCH_DIMENSION_COLOR);
-  anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
+  //std::vector<int> aRGB = Config_PropManager::color("Visualization", "sketch_constraint_color",
+  //                                                  SKETCH_DIMENSION_COLOR);
+  //anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
   }
   return anAIS;
 }
diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp
index bc7d7824e..7bd3d30ef 100644
--- a/src/SketcherPrs/SketcherPrs_Coincident.cpp
+++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp
@@ -57,15 +57,27 @@ void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)&
   static Handle(Graphic3d_AspectMarker3d) aPtA;
   if (aPtA.IsNull()) {
     aPtA = new Graphic3d_AspectMarker3d ();
-    aPtA->SetType(Aspect_TOM_RING1);
-    aPtA->SetScale(2.);
-    aPtA->SetColor(myOwnColor);
   }
+  aPtA->SetType(Aspect_TOM_RING3);
+  aPtA->SetScale(2.);
+  aPtA->SetColor(Quantity_NOC_YELLOW);
+
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation);
   aGroup->SetPrimitivesAspect(aPtA);
   Handle(Graphic3d_ArrayOfPoints) aPntArray = new Graphic3d_ArrayOfPoints(1);
   aPntArray->AddVertex (aPoint->x(), aPoint->y(), aPoint->z());
   aGroup->AddPrimitiveArray (aPntArray);
+
+  aPtA->SetType(Aspect_TOM_RING1);
+  aPtA->SetScale(1.);
+  aPtA->SetColor(Quantity_NOC_BLACK);
+  aGroup->SetPrimitivesAspect(aPtA);
+  aGroup->AddPrimitiveArray (aPntArray);
+
+  aPtA->SetType(Aspect_TOM_POINT);
+  aPtA->SetScale(5.);
+  aGroup->SetPrimitivesAspect(aPtA);
+  aGroup->AddPrimitiveArray (aPntArray);
 }