diff --git a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx index a72cdfec2d..ae5041418e 100644 --- a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx +++ b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx @@ -18,6 +18,7 @@ #include #include #include +#include //======================================================================= // Function: Reset @@ -125,9 +126,14 @@ void BRepMesh_DefaultRangeSplitter::computeTolerance( const Standard_Real aDiffU = myRangeU.second - myRangeU.first; const Standard_Real aDiffV = myRangeV.second - myRangeV.first; + const Standard_Real aTolerance = BRep_Tool::Tolerance (myDFace->GetFace()); + const Adaptor3d_Surface& aSurface = GetSurface()->Surface(); + const Standard_Real aResU = aSurface.UResolution (aTolerance); + const Standard_Real aResV = aSurface.VResolution (aTolerance); + const Standard_Real aDeflectionUV = 1.e-05; - myTolerance.first = Max(Min(aDeflectionUV, 0.1 * aDiffU), 1e-7 * aDiffU); - myTolerance.second = Max(Min(aDeflectionUV, 0.1 * aDiffV), 1e-7 * aDiffV); + myTolerance.first = Max(Min(aDeflectionUV, aResU), 1e-7 * aDiffU); + myTolerance.second = Max(Min(aDeflectionUV, aResV), 1e-7 * aDiffV); } //======================================================================= diff --git a/tests/bugs/iges/buc60823 b/tests/bugs/iges/buc60823 index 4724b1cbc3..b20f3bc60c 100755 --- a/tests/bugs/iges/buc60823 +++ b/tests/bugs/iges/buc60823 @@ -14,6 +14,6 @@ vdisplay result vsetdispmode result 1 vfit -checktrinfo result -tri 2708 -nod 2608 +checktrinfo result -tri 2711 -nod 2611 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/iges/bug306 b/tests/bugs/iges/bug306 index 0e844344e3..1e0a1ac19f 100755 --- a/tests/bugs/iges/bug306 +++ b/tests/bugs/iges/bug306 @@ -20,7 +20,7 @@ vsetdispmode result 1 vdisplay result vfit -checktrinfo result -tri 5812 -nod 5809 +checktrinfo result -tri 5814 -nod 5811 checkmaxtol result -ref 0.92213088179312575 checknbshapes result -shell 1 diff --git a/tests/bugs/mesh/bug23513 b/tests/bugs/mesh/bug23513 index 5c46f1e1a7..ab612f14f3 100644 --- a/tests/bugs/mesh/bug23513 +++ b/tests/bugs/mesh/bug23513 @@ -12,7 +12,7 @@ vfit checkview -screenshot -3d -path ${imagedir}/${test_image}.png -checktrinfo result -tri 323648 -nod 161865 -defl 0.00096399964870812682 +checktrinfo result -tri 323820 -nod 161951 -defl 0.00096399964870812682 set log [tricheck result] if { [llength $log] != 0 } { diff --git a/tests/bugs/mesh/bug25827 b/tests/bugs/mesh/bug25827 index 365214fdee..33d44dd6d3 100644 --- a/tests/bugs/mesh/bug25827 +++ b/tests/bugs/mesh/bug25827 @@ -1,4 +1,4 @@ -puts "TODO CR25827 ALL: Faulty shapes in variables faulty_" +#puts "TODO CR25827 ALL: Faulty shapes in variables faulty_" puts "=========" puts "CR25827" diff --git a/tests/bugs/mesh/bug29962 b/tests/bugs/mesh/bug29962 index e9c9c4b964..19f65eb8ce 100644 --- a/tests/bugs/mesh/bug29962 +++ b/tests/bugs/mesh/bug29962 @@ -27,7 +27,7 @@ if { [llength $log2] != 0 } { puts "Mesh is OK" } -checktrinfo result -tri 78186 -nod 39096 -defl 0.035123046705520911 +checktrinfo result -tri 78200 -nod 39103 -defl 0.035123046705520911 don result isos result 0 diff --git a/tests/bugs/mesh/bug31199_1 b/tests/bugs/mesh/bug31199_1 new file mode 100644 index 0000000000..89eca7e383 --- /dev/null +++ b/tests/bugs/mesh/bug31199_1 @@ -0,0 +1,19 @@ +puts "=======" +puts "0031199: BRepMesh fails on thin faces" +puts "=======" +puts "" + +restore [locate_data_file bug31199_ok.brep] result + +incmesh result 0.1 + +checktrinfo result -tri 90 -nod 90 + +donly result +triangles result +isos result 0 + +top +fit + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/mesh/bug31199_2 b/tests/bugs/mesh/bug31199_2 new file mode 100644 index 0000000000..a67baa86de --- /dev/null +++ b/tests/bugs/mesh/bug31199_2 @@ -0,0 +1,19 @@ +puts "=======" +puts "0031199: BRepMesh fails on thin faces" +puts "=======" +puts "" + +restore [locate_data_file bug31199_failure1.brep] result + +incmesh result 0.1 + +checktrinfo result -tri 90 -nod 92 + +donly result +triangles result +isos result 0 + +top +fit + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/mesh/bug31199_3 b/tests/bugs/mesh/bug31199_3 new file mode 100644 index 0000000000..39e4647f34 --- /dev/null +++ b/tests/bugs/mesh/bug31199_3 @@ -0,0 +1,19 @@ +puts "=======" +puts "0031199: BRepMesh fails on thin faces" +puts "=======" +puts "" + +restore [locate_data_file bug31199_failure2.brep] result + +incmesh result 0.1 + +checktrinfo result -tri 78 -nod 80 + +donly result +triangles result +isos result 0 + +top +fit + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/mesh/bug31199_4 b/tests/bugs/mesh/bug31199_4 new file mode 100644 index 0000000000..57d75d25ee --- /dev/null +++ b/tests/bugs/mesh/bug31199_4 @@ -0,0 +1,19 @@ +puts "=======" +puts "0031199: BRepMesh fails on thin faces" +puts "=======" +puts "" + +restore [locate_data_file bug31199_failure3.brep] result + +incmesh result 0.1 + +checktrinfo result -tri 78 -nod 80 + +donly result +triangles result +isos result 0 + +top +fit + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/moddata_1/bug15519 b/tests/bugs/moddata_1/bug15519 index d202b6b09e..4ea7a145c9 100755 --- a/tests/bugs/moddata_1/bug15519 +++ b/tests/bugs/moddata_1/bug15519 @@ -14,5 +14,5 @@ tclean result set Deflection 1. catch {incmesh result ${Deflection} } -checktrinfo result -tri 52685 -nod 46258 -defl 1.0 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 +checktrinfo result -tri 52956 -nod 46525 -defl 1.0 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/moddata_1/bug22759 b/tests/bugs/moddata_1/bug22759 index 1c0ea61ba9..f03ac3e0a1 100755 --- a/tests/bugs/moddata_1/bug22759 +++ b/tests/bugs/moddata_1/bug22759 @@ -19,7 +19,7 @@ tclean result set Deflection 0.001 incmesh result ${Deflection} -checktrinfo result -tri 346096 -nod 176022 -defl 0.0092442421472206764 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 +checktrinfo result -tri 375392 -nod 190670 -defl 0.0092442421472206764 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 vinit vdisplay result diff --git a/tests/bugs/moddata_2/bug258_1 b/tests/bugs/moddata_2/bug258_1 index 95434f3092..9290b22b62 100755 --- a/tests/bugs/moddata_2/bug258_1 +++ b/tests/bugs/moddata_2/bug258_1 @@ -15,5 +15,5 @@ vsetdispmode result 1 vfit triangles result -checktrinfo result -tri 78 -nod 80 +checktrinfo result -tri 78 -nod 82 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/moddata_2/bug428 b/tests/bugs/moddata_2/bug428 index c2bb6f5b7c..7140f02607 100755 --- a/tests/bugs/moddata_2/bug428 +++ b/tests/bugs/moddata_2/bug428 @@ -19,5 +19,5 @@ isos result 0 triangles result fit -checktrinfo result -tri 10886 -nod 7830 +checktrinfo result -tri 10924 -nod 7869 checkview -screenshot -2d -path ${imagedir}/${test_image}_axo.png diff --git a/tests/hlr/poly_hlr/C17 b/tests/hlr/poly_hlr/C17 index 92f75c1b13..028db8b5d3 100644 --- a/tests/hlr/poly_hlr/C17 +++ b/tests/hlr/poly_hlr/C17 @@ -1,5 +1,5 @@ set viewname "vright" -set length 2234.46 +set length 2234.38 testreadstep [locate_data_file bug27341_CCT_PMK_32_L_o_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C4 b/tests/hlr/poly_hlr/C4 index 47ab7b1449..38b7efc966 100644 --- a/tests/hlr/poly_hlr/C4 +++ b/tests/hlr/poly_hlr/C4 @@ -1,4 +1,4 @@ -puts "TODO OCC30286 ALL: Error : The length of result shape is 2707.46, expected 2765.47" +puts "TODO OCC30286 ALL: Error : The length of result shape is 2707.33, expected 2765.47" set viewname "vright" set length 2765.47 diff --git a/tests/hlr/poly_hlr/bug27979_1 b/tests/hlr/poly_hlr/bug27979_1 index e97e89ac6a..f7c3d0cadf 100644 --- a/tests/hlr/poly_hlr/bug27979_1 +++ b/tests/hlr/poly_hlr/bug27979_1 @@ -1,4 +1,4 @@ -puts "TODO OCC30286 ALL: Error : The length of result shape is 3.5348, expected 3." +puts "TODO OCC30286 ALL: Error : The length of result shape is 3.53405, expected 3." puts "========================================================================" puts "OCC27979: Parasolid converted BREP shows weird lines on hidden line Algo" diff --git a/tests/hlr/poly_hlr/bug27979_2 b/tests/hlr/poly_hlr/bug27979_2 index 578d43e4e6..67f500ae20 100644 --- a/tests/hlr/poly_hlr/bug27979_2 +++ b/tests/hlr/poly_hlr/bug27979_2 @@ -1,4 +1,4 @@ -puts "TODO OCC30286 ALL: Error : The length of result shape is 12.4882, expected 12." +puts "TODO OCC30286 ALL: Error : The length of result shape is 12.4883, expected 12." puts "========================================================================" puts "OCC27979: Parasolid converted BREP shows weird lines on hidden line Algo" diff --git a/tests/hlr/poly_hlr/bug27979_4 b/tests/hlr/poly_hlr/bug27979_4 index 97f5331630..f626c1ef7f 100644 --- a/tests/hlr/poly_hlr/bug27979_4 +++ b/tests/hlr/poly_hlr/bug27979_4 @@ -1,4 +1,4 @@ -puts "TODO OCC30286 ALL: Error : The length of result shape is 11.4456, expected 11." +puts "TODO OCC30286 ALL: Error : The length of result shape is 11.4458, expected 11." puts "========================================================================" puts "OCC27979: Parasolid converted BREP shows weird lines on hidden line Algo" diff --git a/tests/hlr/poly_hlr/bug27979_6 b/tests/hlr/poly_hlr/bug27979_6 index 3181bf3889..ec2ad03360 100644 --- a/tests/hlr/poly_hlr/bug27979_6 +++ b/tests/hlr/poly_hlr/bug27979_6 @@ -1,4 +1,4 @@ -puts "TODO OCC30286 ALL: Error : The length of result shape is 11.2106, expected 11." +puts "TODO OCC30286 ALL: Error : The length of result shape is 11.2065, expected 11." puts "========================================================================" puts "OCC27979: Parasolid converted BREP shows weird lines on hidden line Algo" diff --git a/tests/mesh/data/advanced/B2 b/tests/mesh/data/advanced/B2 index 492172e731..6b8716ed3e 100755 --- a/tests/mesh/data/advanced/B2 +++ b/tests/mesh/data/advanced/B2 @@ -1,7 +1,7 @@ set TheFileName OCC22145.stp set bug_freenodes "OCC22687" -set bug_cross "OCC22687" -set nbcross(ALL) 8 +#set bug_cross "OCC22687" +#set nbcross(ALL) 8 if { [string compare $command "shading"] == 0 } { set nbfreenodes(ALL) 4 } else { diff --git a/tests/mesh/data/advanced/B3 b/tests/mesh/data/advanced/B3 index 492172e731..6b8716ed3e 100755 --- a/tests/mesh/data/advanced/B3 +++ b/tests/mesh/data/advanced/B3 @@ -1,7 +1,7 @@ set TheFileName OCC22145.stp set bug_freenodes "OCC22687" -set bug_cross "OCC22687" -set nbcross(ALL) 8 +#set bug_cross "OCC22687" +#set nbcross(ALL) 8 if { [string compare $command "shading"] == 0 } { set nbfreenodes(ALL) 4 } else { diff --git a/tests/mesh/data/advanced/B7 b/tests/mesh/data/advanced/B7 index 6d821b3e3f..74652ac486 100755 --- a/tests/mesh/data/advanced/B7 +++ b/tests/mesh/data/advanced/B7 @@ -1,8 +1,8 @@ set TheFileName OCC22302.brep set bug_freenodes "OCC22687" set bug_area "OCC22687" -set bug_cross "OCC22687" -set nbcross(ALL) 8 +#set bug_cross "OCC22687" +#set nbcross(ALL) 8 if { [string compare $command "shading"] == 0 } { set nbfreenodes(ALL) 4 } else { diff --git a/tests/mesh/data/standard/H5 b/tests/mesh/data/standard/H5 index 9cf10d0060..c823258ff3 100755 --- a/tests/mesh/data/standard/H5 +++ b/tests/mesh/data/standard/H5 @@ -1,3 +1,3 @@ set TheFileName shading_068.brep -set bug_cross "OCC22687" -set nbcross(ALL) 2 +#set bug_cross "OCC22687" +#set nbcross(ALL) 2 diff --git a/tests/mesh/data/standard/M8 b/tests/mesh/data/standard/M8 index f6dd4877f7..76e189fee3 100755 --- a/tests/mesh/data/standard/M8 +++ b/tests/mesh/data/standard/M8 @@ -5,5 +5,5 @@ if { [string compare $command "shading"] == 0 } { } else { set rel_tol 6.376860334255998 } -set bug_freenodes "M8" -set nbfreenodes(All) 1 +#set bug_freenodes "M8" +#set nbfreenodes(All) 1 diff --git a/tests/mesh/data/standard/P8 b/tests/mesh/data/standard/P8 index 8d33688eae..7fe970633b 100755 --- a/tests/mesh/data/standard/P8 +++ b/tests/mesh/data/standard/P8 @@ -1 +1,3 @@ set TheFileName shading_143.brep +set bug_freenodes "P8" +set nbfreenodes(ALL) 2