updated copyright message

[modules/shaper.git] / src / GeomAPI / GeomAPI_Vertex.cpp

diff --git a/src/GeomAPI/GeomAPI_Vertex.cpp b/src/GeomAPI/GeomAPI_Vertex.cpp
index b22c4a7bb49532360f465f8a9a267e612165e54f..adb04beeed9a1808fa9b35995467761f9f95bc4f 100644 (file)
--- a/src/GeomAPI/GeomAPI_Vertex.cpp
+++ b/src/GeomAPI/GeomAPI_Vertex.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<GeomAPI_Vertex.h>
@@ -30,6 +29,14 @@
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
 
+static TopoDS_Shape* buildVertex(const gp_Pnt& thePoint)
+{
+  TopoDS_Vertex aVertex;
+  BRep_Builder aBuilder;
+  aBuilder.MakeVertex(aVertex, thePoint, Precision::Confusion());
+  return new TopoDS_Shape(aVertex);
+}
+
 GeomAPI_Vertex::GeomAPI_Vertex()
   : GeomAPI_Shape()
 {
@@ -42,12 +49,14 @@ GeomAPI_Vertex::GeomAPI_Vertex(const std::shared_ptr<GeomAPI_Shape>& theShape)
   }
 }
 
+GeomAPI_Vertex::GeomAPI_Vertex(const std::shared_ptr<GeomAPI_Pnt>& thePoint)
+{
+  setImpl(buildVertex(thePoint->impl<gp_Pnt>()));
+}
+
 GeomAPI_Vertex::GeomAPI_Vertex(double theX, double theY, double theZ)
 {
-  TopoDS_Vertex aVertex;
-  BRep_Builder aBuilder;
-  aBuilder.MakeVertex(aVertex, gp_Pnt(theX, theY, theZ), Precision::Confusion());
-  setImpl(new TopoDS_Shape(aVertex));
+  setImpl(buildVertex(gp_Pnt(theX, theY, theZ)));
 }
 
 std::shared_ptr<GeomAPI_Pnt> GeomAPI_Vertex::point()
@@ -76,3 +85,23 @@ bool GeomAPI_Vertex::isEqual(const std::shared_ptr<GeomAPI_Shape> theVert) const
 
   return aPoint1.IsEqual(aPoint2, Precision::Confusion()) == Standard_True;
 }
+
+
+
+bool GeomAPI_Vertex::GeometricComparator::operator()(const GeomVertexPtr& theVertex1,
+                                                     const GeomVertexPtr& theVertex2) const
+{
+  const TopoDS_Vertex& aVertex1 = theVertex1->impl<TopoDS_Vertex>();
+  const TopoDS_Vertex& aVertex2 = theVertex2->impl<TopoDS_Vertex>();
+
+  gp_Pnt aPnt1 = BRep_Tool::Pnt(aVertex1);
+  gp_Pnt aPnt2 = BRep_Tool::Pnt(aVertex2);
+
+  bool isLess = aPnt1.X() + myTolerance < aPnt2.X();
+  if (!isLess && aPnt1.X() <= aPnt2.X() + myTolerance) {
+    isLess = aPnt1.Y() + myTolerance < aPnt2.Y();
+    if (!isLess && aPnt1.Y() <= aPnt2.Y() + myTolerance)
+      isLess = aPnt1.Z() + myTolerance < aPnt2.Z();
+  }
+  return isLess;
+}