X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Vertex.cpp;h=5025a6aaa75846722e73d765f7f7d2f8f6ea9f6c;hb=922c5eceb93e68e87e6e4d22583de0d1f25ff483;hp=b22c4a7bb49532360f465f8a9a267e612165e54f;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Vertex.cpp b/src/GeomAPI/GeomAPI_Vertex.cpp index b22c4a7bb..5025a6aaa 100644 --- 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-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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -76,3 +75,23 @@ bool GeomAPI_Vertex::isEqual(const std::shared_ptr 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(); + const TopoDS_Vertex& aVertex2 = theVertex2->impl(); + + 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; +}