X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.cpp;h=f9e2e2959123b8d00fd9ce62356ada24721d7892;hb=a5746a7f8fd8bcd555fb16f98e312c86ca1210da;hp=b85d018b361da4502cfa8bbbc51b465261de0799;hpb=150ef68b3ea2df3c2130a4f5ea8128ddb5c76048;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp
index b85d018b3..f9e2e2959 100644
--- a/src/SketcherPrs/SketcherPrs_Coincident.cpp
+++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp
@@ -18,7 +18,6 @@
 
 #include <SketchPlugin_Constraint.h>
 
-#include <AIS_Drawer.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Prs3d_PointAspect.hxx>
@@ -44,8 +43,11 @@ void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)&
                                    const Handle(Prs3d_Presentation)& thePresentation, 
                                    const Standard_Integer theMode)
 {
+  // Get point of the presentation
   std::shared_ptr<GeomAPI_Pnt2d> aPnt = SketcherPrs_Tools::getPoint(myConstraint, 
                                                                     SketchPlugin_Constraint::ENTITY_A());
+  if (aPnt.get() == NULL)
+    aPnt = SketcherPrs_Tools::getPoint(myConstraint, SketchPlugin_Constraint::ENTITY_B());
   if (aPnt.get() == NULL)
     return;
 
@@ -55,26 +57,39 @@ 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);
   }
+  // Create the presentation as a combination of standard point markers
+
+  // The external yellow contour
+  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);
+
+  // Make a black mid ring
+  aPtA->SetType(Aspect_TOM_RING1);
+  aPtA->SetScale(1.);
+  aPtA->SetColor(Quantity_NOC_BLACK);
+  aGroup->SetPrimitivesAspect(aPtA);
+  aGroup->AddPrimitiveArray (aPntArray);
+
+  // Make an internal ring
+  aPtA->SetType(Aspect_TOM_POINT);
+  aPtA->SetScale(5.);
+  aGroup->SetPrimitivesAspect(aPtA);
+  aGroup->AddPrimitiveArray (aPntArray);
 }
 
 
 void SketcherPrs_Coincident::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
                                             const Standard_Integer aMode)
 {
-//  if ((aMode == 0) || (aMode == SketcherPrs_Tools::Sel_Constraint)) {
-//    Handle(SelectMgr_EntityOwner) aOwn = new SelectMgr_EntityOwner(this, 10);
-//    Handle(Select3D_SensitivePoint) aSp = new Select3D_SensitivePoint(aOwn, myPoint);
-//    aSelection->Add(aSp);
-//  }
+  // There is no selection of coincident - a point is selected instead of coincidence
 }
 
 void SketcherPrs_Coincident::SetColor(const Quantity_NameOfColor aCol)