From: dbv <dbv@opencascade.com>
Date: Wed, 5 Apr 2017 08:21:40 +0000 (+0300)
Subject: Issue #2090: Line not selectable when creating an arc by its center
X-Git-Tag: V_2.7.0~74
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5ad83dd4300d19b33dbe06f414de71ec42243a7f;p=modules%2Fshaper.git

Issue #2090: Line not selectable when creating an arc by its center

Fixed validator.
---

diff --git a/src/GeomAPI/GeomAPI_Shape.cpp b/src/GeomAPI/GeomAPI_Shape.cpp
index c811116df..78179ec86 100644
--- a/src/GeomAPI/GeomAPI_Shape.cpp
+++ b/src/GeomAPI/GeomAPI_Shape.cpp
@@ -10,6 +10,7 @@
 #include <BRepAlgoAPI_Section.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepBuilderAPI_FindPlane.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepTools.hxx>
 #include <Bnd_Box.hxx>
 #include <Geom_Circle.hxx>
@@ -31,6 +32,8 @@
 #include <sstream>
 #include <algorithm> // for std::transform
 
+#include <BRepTools.hxx>
+
 #define MY_SHAPE implPtr<TopoDS_Shape>()
 
 GeomAPI_Shape::GeomAPI_Shape()
@@ -455,3 +458,21 @@ GeomShapePtr GeomAPI_Shape::intersect(const GeomShapePtr theShape) const
   aResShape->setImpl(new TopoDS_Shape(aResult));
   return aResShape;
 }
+
+bool GeomAPI_Shape::isIntersect(const GeomShapePtr theShape) const
+{
+  if(!theShape.get()) {
+    return false;
+  }
+
+  const TopoDS_Shape& aShape1 = const_cast<GeomAPI_Shape*>(this)->impl<TopoDS_Shape>();
+  const TopoDS_Shape& aShape2 = theShape->impl<TopoDS_Shape>();
+
+  BRepExtrema_DistShapeShape aDist(aShape1, aShape2);
+  aDist.Perform();
+  if(aDist.IsDone() && aDist.Value() < Precision::Confusion()) {
+    return true;
+  }
+
+  return false;
+}
diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 1c7f2c7f8..fa1b7766b 100644
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -124,6 +124,10 @@ public:
   /// Returns intersection of shapes
   GEOMAPI_EXPORT
   std::shared_ptr<GeomAPI_Shape> intersect(const std::shared_ptr<GeomAPI_Shape> theShape) const;
+
+  /// Returns true if min distance between shapes < tolerance.
+  GEOMAPI_EXPORT
+  bool isIntersect(const std::shared_ptr<GeomAPI_Shape> theShape) const;
 };
 
 //! Pointer on list of shapes
diff --git a/src/SketchPlugin/SketchPlugin_Validators.cpp b/src/SketchPlugin/SketchPlugin_Validators.cpp
index 9190be38a..630ba0e8d 100755
--- a/src/SketchPlugin/SketchPlugin_Validators.cpp
+++ b/src/SketchPlugin/SketchPlugin_Validators.cpp
@@ -1384,8 +1384,7 @@ bool SketchPlugin_ArcEndPointIntersectionValidator::isValid(
   if(aResult.get()) {
     GeomShapePtr aShape = toInfiniteEdge(aResult->shape());
     if(aShape.get() && !aShape->isNull()) {
-      GeomShapePtr anIntersection = anArcShape->intersect(aShape);
-      if(anIntersection.get() && !anIntersection->isNull()) {
+      if(anArcShape->isIntersect(aShape)) {
         return true;
       }
     }
@@ -1400,8 +1399,7 @@ bool SketchPlugin_ArcEndPointIntersectionValidator::isValid(
     {
       GeomShapePtr aShape = toInfiniteEdge((*anIt)->shape());
       if(aShape.get() && !aShape->isNull()) {
-        GeomShapePtr anIntersection = anArcShape->intersect(aShape);
-        if(anIntersection.get() && !anIntersection->isNull()) {
+        if(anArcShape->isIntersect(aShape)) {
           return true;
         }
       }