From a6af85dde913ec7ad955a24b72d52c7fcd771c88 Mon Sep 17 00:00:00 2001 From: oan Date: Fri, 5 Feb 2016 15:23:08 +0300 Subject: [PATCH] 0027119: Regression: Draw command "incmesh" hangs on the attacheced face. BRepMesh_CircleTool: extend radius of circle by quite small value in order to classify points forming inscribed triangle as lying on it. Do not use PConfusion due to false positive result leading algorithm to hanging. --- src/BRepMesh/BRepMesh_CircleTool.cxx | 2 +- tests/bugs/mesh/bug27119 | 44 ++++++++++++++++++++++++++++ tests/bugs/moddata_1/bug22759 | 8 ++--- tests/mesh/data/standard/B3 | 14 ++++----- 4 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 tests/bugs/mesh/bug27119 diff --git a/src/BRepMesh/BRepMesh_CircleTool.cxx b/src/BRepMesh/BRepMesh_CircleTool.cxx index 5697216273..1aead23481 100644 --- a/src/BRepMesh/BRepMesh_CircleTool.cxx +++ b/src/BRepMesh/BRepMesh_CircleTool.cxx @@ -152,7 +152,7 @@ Standard_Boolean BRepMesh_CircleTool::MakeCircle(const gp_XY& thePoint1, theRadius = Sqrt(Max(Max((thePoint1 - aIntPnt).SquareModulus(), (thePoint2 - aIntPnt).SquareModulus()), - (thePoint3 - aIntPnt).SquareModulus())) + aPrecision; + (thePoint3 - aIntPnt).SquareModulus())) + 2 * RealEpsilon(); return Standard_True; } diff --git a/tests/bugs/mesh/bug27119 b/tests/bugs/mesh/bug27119 new file mode 100644 index 0000000000..e36f79aed3 --- /dev/null +++ b/tests/bugs/mesh/bug27119 @@ -0,0 +1,44 @@ +puts "========" +puts "OCC27119" +puts "========" +puts "" +########################################### +## Regression: Draw command "incmesh" hangs on the attacheced face. +########################################### + +set BugNumber OCC27119 + +restore [locate_data_file bug27119_GrossPlatePart3Step2TransformedFace.brep] result + +dchrono t reset +dchrono t start +incmesh result 1.e-6 +dchrono t stop +set time [dchrono t show] +regexp {CPU user time: ([0-9|.]+) seconds} $time full seconds + +set tri 0 +set nod 0 +set def 0 + +set tri_info [trinfo result] +regexp { +([-0-9.+eE]+) +triangles} $tri_info full tri +regexp { +([-0-9.+eE]+) +nodes} $tri_info full nod +regexp { deflection +([-0-9.+eE]+)} $tri_info full def + +set ref_tri 7855 +set ref_nod 7857 +set ref_def 9.3791641120333225e-013 +set tol_rel 0.01 + +# Computes deviation of the value from specified one +checkreal "Nb of triangles" $tri $ref_tri 0 $tol_rel +checkreal "Nb of nodes" $nod $ref_nod 0 $tol_rel +checkreal "Deflection" $def $ref_def 1.e-12 0 + +set eps_time 3 +if { $seconds > $eps_time } { + puts "Error: Too slow ($seconds > $eps_time)" +} + +set 3dviewer 1 diff --git a/tests/bugs/moddata_1/bug22759 b/tests/bugs/moddata_1/bug22759 index c7befea4f9..53888e0ae6 100755 --- a/tests/bugs/moddata_1/bug22759 +++ b/tests/bugs/moddata_1/bug22759 @@ -30,13 +30,13 @@ regexp {deflection +([-0-9.+eE]+)} $tri_info full defl set env(os_type) $tcl_platform(platform) if { [string compare $env(os_type) "windows"] != 0 } { puts "OS = Linux" - set good_tri 520414 - set good_nod 263938 + set good_tri 521058 + set good_nod 264260 set good_defl 0.0026800432954056617 } else { puts "OS = Windows NT" - set good_tri 520414 - set good_nod 263938 + set good_tri 521058 + set good_nod 264260 set good_defl 0.0026800432954056617 } diff --git a/tests/mesh/data/standard/B3 b/tests/mesh/data/standard/B3 index 3d5d29e413..d20ef3b0fa 100755 --- a/tests/mesh/data/standard/B3 +++ b/tests/mesh/data/standard/B3 @@ -1,10 +1,10 @@ set TheFileName shading_012.brep ###set bug_withouttri "OCC22687" ###set nbwithouttri(All) 1 -#if { [string compare $command "shading"] == 0 } { -# set bug_freelinks "OCC23106" -# set nbfree(All) 4 -#} else { -# set bug_freelinks "OCC25378" -# set nbfree(All) 3 -#} +if { [string compare $command "shading"] == 0 } { + set bug_freelinks "OCC23106" + set nbfree(All) 4 +} else { + set bug_freelinks "OCC25378" + set nbfree(All) 3 +} -- 2.39.5