0027856: Regression vs 6.7.1: General Fuse operation fails to fuse the solids

Method WorkWithBoundaries::BoundaryEstimation(...) has been brought in balance with IsParallel(...) method, which checks if cylinder axes are parallel.

(cherry picked from commit 95f8c6082dae20e53c196418ed9790fe78757109)

diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
index 34fe6c58418301097c03d315fe97c1c5b7fb09d5..5c14cad95ccec8a9e254a07d97b704f2dd38534d 100644 (file)
--- a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
+++ b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
@@ -2443,7 +2443,7 @@ void WorkWithBoundaries::BoundaryEstimation(const gp_Cylinder& theCy1,
   //one axis can be translated by parallel shifting till intersection).
 
   const Standard_Real aCosA = aD1.Dot(aD2);
-  const Standard_Real aSqSinA = 1.0 - aCosA * aCosA;
+  const Standard_Real aSqSinA = aD1.XYZ().CrossSquareMagnitude(aD2.XYZ());
 
   //If sine is small then it can be compared with angle.
   if (aSqSinA < Precision::Angular()*Precision::Angular())

diff --git a/tests/bugs/modalg_6/bug27856_1 b/tests/bugs/modalg_6/bug27856_1
new file mode 100644 (file)
index 0000000..14bc945
--- /dev/null
+++ b/tests/bugs/modalg_6/bug27856_1
@@ -0,0 +1,15 @@
+puts "========"
+puts "OCC27856"
+puts "========"
+puts ""
+#################################################
+# Regression vs 6.7.1: General Fuse operation fails to fuse the solids
+#################################################
+
+restore [locate_data_file bug27856_int_solids.brep] b
+bclearobjects
+bcleartools
+baddcompound b
+bfillds
+bbuild result
+checknbshapes result -solid 12

diff --git a/tests/bugs/modalg_6/bug27856_2 b/tests/bugs/modalg_6/bug27856_2
new file mode 100644 (file)
index 0000000..17e72d7
--- /dev/null
+++ b/tests/bugs/modalg_6/bug27856_2
@@ -0,0 +1,118 @@
+puts "========"
+puts "OCC27856"
+puts "========"
+puts ""
+#################################################
+# Regression vs 6.7.1: General Fuse operation fails to fuse the solids
+#################################################
+
+# Before the fix, EMPTY result (no points, no curves)
+# was returned in every considered case.
+
+restore [locate_data_file bug27856_int_solids.brep] b
+
+explode b so
+
+# first pair of solids
+explode b_1 f
+explode b_2 f
+
+# ----
+
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_1_2 b_2_2 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 0.00026943844817627679 0.0 1.0e-3
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_1_4 b_2_4 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 6.5039065434503992e-005 0.0 1.0e-2
+
+# ----
+
+# second pair of solids
+
+explode b_3 f
+explode b_4 f
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_3_2 b_4_2 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 0.00030603795647549098 0.0 1.0e-3
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_3_4 b_4_4 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 0.00029242900088525842 0.0 1.0e-3
+
+# ----
+
+# third pair of solids
+
+explode b_5 f
+explode b_6 f
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_5_2 b_6_2 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 2.0312181042800029e-005 0.0 1.0e-2
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_5_4 b_6_4 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 0.00023415774730871651 0.0 1.0e-3
+
+# ----
+
+# fourth pair of solids
+
+explode b_7 f
+explode b_8 f
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_7_2 b_8_2 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 0.00028209392756607551 0.0 1.0e-3
+
+# ----
+
+set Toler 0.0
+set NbCurv 0
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_7_4 b_8_4 -2d] full Toler NbCurv
+if {${NbCurv} != 1} {
+  puts "Error: Number of curves is bad!"
+}
+checkreal TolReached $Toler 2.497244318171703e-005 0.0 1.0e-2
+