From 529444be92b1e446aa4006b9e245b7afdcb3a3f8 Mon Sep 17 00:00:00 2001
From: emv <emv@opencascade.com>
Date: Fri, 10 Jul 2020 09:02:26 +0300
Subject: [PATCH] 0031655: Modeling Algorithms - Invalid result of General Fuse
 operation

IntTools_BeanFaceIntersector: Perform exact intersection range search in case there are few intersection points.
---
 src/IntTools/IntTools_BeanFaceIntersector.cxx | 15 ++++--
 tests/bugs/modalg_7/bug31655                  | 46 +++++++++++++++++++
 tests/bugs/moddata_2/pro19422_1               |  1 +
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/modalg_7/bug31655

diff --git a/src/IntTools/IntTools_BeanFaceIntersector.cxx b/src/IntTools/IntTools_BeanFaceIntersector.cxx
index 5796905a3c..323e249f88 100644
--- a/src/IntTools/IntTools_BeanFaceIntersector.cxx
+++ b/src/IntTools/IntTools_BeanFaceIntersector.cxx
@@ -582,10 +582,19 @@ void IntTools_BeanFaceIntersector::ComputeAroundExactIntersection()
   Handle(BRepAdaptor_HSurface) aSurface = new BRepAdaptor_HSurface(mySurface);
   
   anExactIntersector.Perform(aCurve, aSurface);
-  
-  if(anExactIntersector.IsDone()) {
+
+  if (anExactIntersector.IsDone()) {
     Standard_Integer i = 0;
-    
+
+    if (anExactIntersector.NbPoints() > 1)
+    {
+      // To avoid unification of the intersection points in a single intersection
+      // range, perform exact range search considering the lowest possible tolerance
+      // for edge and face.
+      myCriteria = 3 * Precision::Confusion();
+      myCurveResolution = myCurve.Resolution (myCriteria);
+    }
+
     for(i = 1; i <= anExactIntersector.NbPoints(); i++) {
       const IntCurveSurface_IntersectionPoint& aPoint = anExactIntersector.Point(i);
       
diff --git a/tests/bugs/modalg_7/bug31655 b/tests/bugs/modalg_7/bug31655
new file mode 100644
index 0000000000..61146b51e8
--- /dev/null
+++ b/tests/bugs/modalg_7/bug31655
@@ -0,0 +1,46 @@
+puts "============================================================================================="
+puts "0031655: Modeling Algorithms - Invalid result of General Fuse operation"
+puts "============================================================================================="
+puts ""
+
+restore [locate_data_file bug31604_a.brep] a
+restore [locate_data_file bug31604_b.brep] b
+
+bclearobjects
+bcleartools
+baddobjects a
+baddtools b
+bfillds
+
+bbop r0 0
+bbop r1 1
+bbop r2 2
+bbop r3 3
+bbop r4 4
+bbuild r5
+
+checkshape r0
+checknbshapes r0 -wire 63 -face 63 -shell 1 -solid 1
+checkprops r0 -s 3567.57 -v 3621.95
+
+checkshape r1
+checknbshapes r1 -wire 61 -face 51 -shell 1 -solid 1
+checkprops r1 -s 13208 -v 28488.4
+
+checkshape r2
+checknbshapes r2 -wire 55 -face 51 -shell 2 -solid 2
+checkprops r2 -s 10997.5 -v 21661.1
+
+checkshape r3
+checknbshapes r3 -wire 69 -face 63 -shell 1 -solid 1
+checkprops r3 -s  5782.58 -v 3224.25
+
+checkshape r4
+checksection r4 -r 4
+checkprops r4 -l 470.345
+
+checkshape r5
+checknbshapes r5 -wire 124 -face 114 -shell 4 -solid 4
+checkprops r5 -s 20343.2 -v 28488.6
+
+checkview -display r3 -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/moddata_2/pro19422_1 b/tests/bugs/moddata_2/pro19422_1
index 9873abb468..244676147d 100755
--- a/tests/bugs/moddata_2/pro19422_1
+++ b/tests/bugs/moddata_2/pro19422_1
@@ -16,5 +16,6 @@ checkshape tool
 bcut result shape tool
 
 checkprops result -s 3166.93
+checknbshapes result -wire 8 -face 8 -shell 1 -solid 1
 checkview -display result -2d -path ${imagedir}/${test_image}.png