X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.cpp;h=d6029af489621f5d48a1b0785dd47bce43dd7db6;hb=8038897b81335a9ec1ff08522ff652299cd2ff3f;hp=9e4c24723e807bbf9b21121ce6285ceaa251e2d9;hpb=6d31c8100e6a561ec496f1ea1d010984da58c0b5;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp
index 9e4c24723..d6029af48 100644
--- 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-2019  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
@@ -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"
@@ -33,6 +32,7 @@
 #include <GeomAPI_Pnt2d.h>
 
 #include <SketchPlugin_Constraint.h>
+#include <SketchPlugin_ConstraintCoincidence.h>
 
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
@@ -59,17 +59,24 @@ bool SketcherPrs_Coincident::IsReadyToDisplay(ModelAPI_Feature* theConstraint,
   return readyToDisplay(theConstraint, thePlane, aPoint);
 }
 
+std::shared_ptr<GeomAPI_Pnt2d> getCoincidencePoint(ModelAPI_Feature* theConstraint)
+{
+  std::shared_ptr<GeomAPI_Pnt2d> aPnt = SketcherPrs_Tools::getPoint(theConstraint,
+    SketchPlugin_Constraint::ENTITY_A());
+  if (aPnt.get() == NULL)
+    aPnt = SketcherPrs_Tools::getPoint(theConstraint, SketchPlugin_Constraint::ENTITY_B());
+
+  return aPnt;
+}
+
+
 bool SketcherPrs_Coincident::readyToDisplay(ModelAPI_Feature* theConstraint,
                                             const std::shared_ptr<GeomAPI_Ax3>& thePlane,
                                             gp_Pnt& thePoint)
 {
   bool aReadyToDisplay = false;
   // Get point of the presentation
-  std::shared_ptr<GeomAPI_Pnt2d> aPnt = SketcherPrs_Tools::getPoint(theConstraint,
-                                                              SketchPlugin_Constraint::ENTITY_A());
-  if (aPnt.get() == NULL)
-    aPnt = SketcherPrs_Tools::getPoint(theConstraint, SketchPlugin_Constraint::ENTITY_B());
-
+  std::shared_ptr<GeomAPI_Pnt2d> aPnt = getCoincidencePoint(theConstraint);
   aReadyToDisplay = aPnt.get() != NULL;
   if (aReadyToDisplay) {
     std::shared_ptr<GeomAPI_Pnt> aPoint = thePlane->to3D(aPnt->x(), aPnt->y());
@@ -79,6 +86,28 @@ bool SketcherPrs_Coincident::readyToDisplay(ModelAPI_Feature* theConstraint,
 }
 
 
+bool hasEdge(ModelAPI_Feature* theConstraint)
+{
+  ObjectPtr aObjA =
+    SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A());
+  ObjectPtr aObjB =
+    SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B());
+  ResultPtr aResA = std::dynamic_pointer_cast<ModelAPI_Result>(aObjA);
+  ResultPtr aResB = std::dynamic_pointer_cast<ModelAPI_Result>(aObjB);
+  if (aResA.get()) {
+    GeomAPI_Shape::ShapeType aTypeA = aResA->shape()->shapeType();
+    if (aTypeA == GeomAPI_Shape::EDGE)
+      return true;
+  }
+  if (aResB.get()) {
+    GeomAPI_Shape::ShapeType aTypeB = aResB->shape()->shapeType();
+    if (aTypeB == GeomAPI_Shape::EDGE)
+      return true;
+  }
+  return false;
+}
+
+
 void SketcherPrs_Coincident::Compute(
   const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
   const Handle(Prs3d_Presentation)& thePresentation,
@@ -89,13 +118,37 @@ void SketcherPrs_Coincident::Compute(
   if (aReadyToDisplay)
     myPoint = aPoint;
 
+  bool aIsEdge = hasEdge(myConstraint);
+  if (!aIsEdge) {
+    std::shared_ptr<GeomAPI_Pnt2d> aPnt = getCoincidencePoint(myConstraint);
+    std::shared_ptr<GeomAPI_Pnt2d> aP;
+    FeaturePtr aSub;
+    int aNumberOfSubs = mySketch->numberOfSubs();
+    for (int i = 0; i < aNumberOfSubs; i++) {
+      aSub = mySketch->subFeature(i);
+      if (aSub->getKind() == SketchPlugin_ConstraintCoincidence::ID() &&
+        aSub.get() != myConstraint) {
+        aP = getCoincidencePoint(aSub.get());
+        if (aP && aP->isEqual(aPnt)) {
+          aIsEdge = hasEdge(aSub.get());
+          if (aIsEdge)
+            break;
+        }
+      }
+    }
+  }
+  Quantity_Color aExternalColor = aIsEdge ? Quantity_NOC_BLACK : Quantity_NOC_YELLOW;
+  Quantity_Color aInternalColor = aIsEdge ? Quantity_NOC_YELLOW : Quantity_NOC_BLACK;
+
+  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 ? Quantity_NOC_YELLOW : myCustomColor);
+  aPtA->SetScale(2. * aRatio);
+  aPtA->SetColor(!aCustomColor ? aExternalColor : myCustomColor);
 
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation);
   aGroup->SetPrimitivesAspect(aPtA);
@@ -105,17 +158,17 @@ void SketcherPrs_Coincident::Compute(
 
   // Make a black mid ring
   aPtA = new Graphic3d_AspectMarker3d();
-  aPtA->SetType(Aspect_TOM_RING1);
-  aPtA->SetScale(1.);
-  aPtA->SetColor(!aCustomColor ? Quantity_NOC_BLACK : myCustomColor);
+  aPtA->SetType(aIsEdge ? Aspect_TOM_STAR : Aspect_TOM_RING1);
+  aPtA->SetScale(1. * aRatio);
+  aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor);
   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 ? Quantity_NOC_BLACK : myCustomColor);
+  aPtA->SetScale(5. * aRatio);
+  aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor);
   aGroup->SetPrimitivesAspect(aPtA);
   aGroup->AddPrimitiveArray (aPntArray);