Issue #2394: Incorrect selected subsolids in "union" after modifying the geometry...

Fix failures in test case related to #2394

diff --git a/src/FeaturesPlugin/Test/Test2394.py b/src/FeaturesPlugin/Test/Test2394.py
index 784e39f305638c9a960215300b92709e7e7c572e..fae2d1a1e26bc0c636ff80ddac0f513fea103701 100644 (file)
--- a/src/FeaturesPlugin/Test/Test2394.py
+++ b/src/FeaturesPlugin/Test/Test2394.py
@@ -106,7 +106,7 @@ Boolean_4.result().subResult(2).setColor(51, 51, 102)
 Boolean_4.result().subResult(3).setColor(102, 204, 102)
 Boolean_4.result().subResult(4).setColor(204, 204, 0)
 
-Union_1 = model.addUnion(Part_1_doc, [model.selection("SOLID", "Boolean_4_1_4"), model.selection("SOLID", "Boolean_4_1_3")])
+Union_1 = model.addUnion(Part_1_doc, [model.selection("SOLID", "Boolean_4_1_4"), model.selection("SOLID", "Boolean_4_1_2")])
 
 Point_3 = model.addPoint(Part_1_doc, model.selection("EDGE", "Axis_1"), model.selection("FACE", "Plane_2 arrivee tuyau"))
 

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
index a6d04aabfd57644a764b269a2e16db52417ed966..730def474410d2313c78a2cca5b9124e70935659 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SortListOfShapes.cpp
@@ -116,10 +116,11 @@ class CompareShapes
 
   bool isLess(const gp_Pnt& theLHS, const gp_Pnt& theRHS)
   {
+    static const double aTol = 10. * Precision::Confusion();
     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;
-      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