0024775: False detecting of intersection in BRepMesh_Classifier class.

Increased checking accuracy of endpoints touching of segments.
Code formatting improvement.
Test case for issue CR24775
Correction test case for issue CR24775

diff --git a/src/BRepMesh/BRepMesh_Classifier.cxx b/src/BRepMesh/BRepMesh_Classifier.cxx
index a9c1d4571fd3acdbab202e56888cad21b2d2ba1c..2c64b046b16cca2421daa571c6d6d3a8fd28d9b5 100644 (file)
--- a/src/BRepMesh/BRepMesh_Classifier.cxx
+++ b/src/BRepMesh/BRepMesh_Classifier.cxx
@@ -266,10 +266,9 @@ static Standard_Boolean checkWiresIntersection(const Standard_Integer
       Standard_Real dd[2][4] = { {(xc-x11), (xc-x12), (xc-x21), (xc-x22)},   //dX
                                  {(yc-y11), (yc-y12), (yc-y21), (yc-y22)} }; //dY
 
-      Standard_Integer i = 0;
-      for(; i < 2; i++ )
+      for( Standard_Integer i = 0; i < 2; i++ )
       {
-        if ( dd[i][0]*dd[i][1] > dTol || dd[i][2]*dd[i][3] > dTol)
+        if ( dd[i][0] * dd[i][1] > RESOLUTION || dd[i][2] * dd[i][3] > RESOLUTION )
         {
           isOnLines = Standard_False;
           break;
@@ -279,7 +278,7 @@ static Standard_Boolean checkWiresIntersection(const Standard_Integer
       // check the intersection point is on the ends of segments
       if ( isOnLines )
       {
-        for( i = 0; i < 2; i++ )
+        for( Standard_Integer i = 0; i < 2; i++ )
         {
           //     if it's the last segment and intersection point lies at the end
           if ( ( jk == jkEnd                                              ||

diff --git a/tests/bugs/mesh/bug24775 b/tests/bugs/mesh/bug24775
new file mode 100755 (executable)
index 0000000..d6f888d
--- /dev/null
+++ b/tests/bugs/mesh/bug24775
@@ -0,0 +1,35 @@
+puts "================"
+puts "CR24775"
+puts "================"
+puts ""
+###############################################
+## False detecting of intersection in BRepMesh_Classifier class.
+###############################################
+
+restore [locate_data_file bug24775_face.brep] face
+vinit
+vdisplay face
+vfit
+
+set trinfo_s [trinfo face]
+regexp {([0-9]+) triangles} ${trinfo_s} str nbtri_s
+regexp {([0-9]+) nodes} ${trinfo_s} str nbnod_s
+regexp {deflection ([0-9.+e-]+)} ${trinfo_s} str defl_s
+
+if { ${nbtri_s} == 0 } {
+   puts "Error: shape contains 0 triangles"
+} else {
+   puts "OK: shape contains triangles"
+}
+
+if { ${nbnod_s} == 0 } {
+   puts "Error: shape contains 0 nodes"
+} else {
+   puts "OK: shape contains nodes"
+}
+
+if { ${defl_s} == 0 } {
+   puts "Error: deflection is 0"
+} else {
+   puts "OK: deflection is good"
+}

diff --git a/tests/mesh/data/standard/V4 b/tests/mesh/data/standard/V4
index b496eb84cc0b015adba130b6449398f88caf40e8..93a64fd5772714eebc6b380f4a4342ede3657366 100755 (executable)
--- a/tests/mesh/data/standard/V4
+++ b/tests/mesh/data/standard/V4
@@ -2,5 +2,4 @@ set TheFileName shading_wrongshape_015.brep
 set bug_withouttri "OCC22687"
 set bug_freenodes "OCC23105"
 set nbfreenodes(ALL) 4
-set nbwithouttri(All) 6
-
+set nbwithouttri(All) 5