Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agy/arch2_ic0'
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
GeomAlgoAPI_SortListOfShapes.cpp
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
b/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
index f75b9ae655b0f99e7b2de0b262ade575de0ed365..e823107a63def695c5f8b09fe742e2cd2bcc08e1 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2017 CEA/DEN, EDF R&D
+// Copyright (C) 2017
-2020
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
//
// 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
//
// 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 "GeomAlgoAPI_SortListOfShapes.h"
//
#include "GeomAlgoAPI_SortListOfShapes.h"
@@
-116,10
+115,11
@@
class CompareShapes
bool isLess(const gp_Pnt& theLHS, const gp_Pnt& theRHS)
{
bool isLess(const gp_Pnt& theLHS, const gp_Pnt& theRHS)
{
+ static const double aTol = 10. * Precision::Confusion();
for (int anIndex = 1; anIndex <= 3; ++anIndex) {
for (int anIndex = 1; anIndex <= 3; ++anIndex) {
- if (isLessWithTol(theLHS.Coord(anIndex), theRHS.Coord(anIndex),
Precision::Confusion()
))
+ if (isLessWithTol(theLHS.Coord(anIndex), theRHS.Coord(anIndex),
aTol
))
return true;
return true;
- else if (isLessWithTol(theRHS.Coord(anIndex), theLHS.Coord(anIndex),
Precision::Confusion()
))
+ else if (isLessWithTol(theRHS.Coord(anIndex), theLHS.Coord(anIndex),
aTol
))
return false;
}
// equal points
return false;
}
// equal points
@@
-133,7
+133,7
@@
class CompareShapes
std::map<TopoDS_TShape*, Bnd_Box>::iterator aFound = myShapes.find(aS);
if (aFound == myShapes.end()) {
Bnd_Box aBB;
std::map<TopoDS_TShape*, Bnd_Box>::iterator aFound = myShapes.find(aS);
if (aFound == myShapes.end()) {
Bnd_Box aBB;
- BRepBndLib::Add
(aShape, aBB
);
+ BRepBndLib::Add
Optimal(aShape, aBB, false
);
myShapes[aS] = aBB;
aFound = myShapes.find(aS);
}
myShapes[aS] = aBB;
aFound = myShapes.find(aS);
}