From f55fe3b3f700f283e2f918fb694b48e502937f76 Mon Sep 17 00:00:00 2001 From: kgv Date: Wed, 28 Sep 2022 19:56:48 +0300 Subject: [PATCH] 0033149: Mesh - misprint in BRepMesh_NURBSRangeSplitter::computeGrainAndFilterParameters() --- src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx | 2 +- tests/bugs/iges/buc60820_1 | 2 +- tests/bugs/iges/buc60820_2 | 2 +- tests/bugs/mesh/bug25287 | 2 +- tests/bugs/mesh/bug27384_2 | 2 +- tests/bugs/mesh/bug27845 | 2 +- tests/bugs/mesh/bug30008_1 | 2 +- tests/bugs/mesh/bug31251 | 4 ++-- tests/bugs/mesh/bug32424 | 2 +- tests/bugs/modalg_2/bug264_11 | 2 +- tests/bugs/moddata_2/bug428 | 2 +- tests/bugs/moddata_2/fra62476_1 | 1 - tests/bugs/moddata_2/fra62476_2 | 2 +- tests/hlr/poly_hlr/C13 | 2 +- tests/hlr/poly_hlr/C14 | 2 +- tests/hlr/poly_hlr/C16 | 2 +- tests/hlr/poly_hlr/C20 | 2 +- tests/hlr/poly_hlr/C5 | 2 +- tests/hlr/poly_hlr/C6 | 2 +- tests/hlr/poly_hlr/C7 | 2 +- tests/hlr/poly_hlr/bug23625_2 | 2 +- tests/mesh/data/standard/X1 | 2 +- 22 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx b/src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx index d0cb22ea67..0f78d5e924 100644 --- a/src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx +++ b/src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx @@ -556,7 +556,7 @@ Handle(IMeshData::SequenceOfReal) BRepMesh_NURBSRangeSplitter::computeGrainAndFi const Handle(BRepAdaptor_Surface)& aSurface = GetSurface(); const Standard_Real aMinSize2d = Max( aSurface->UResolution(theParameters.MinSize), - aSurface->UResolution(theParameters.MinSize)); + aSurface->VResolution(theParameters.MinSize)); aMinDiff = Max(aMinSize2d, aMinDiff); diff --git a/tests/bugs/iges/buc60820_1 b/tests/bugs/iges/buc60820_1 index 3253afd1af..9abdd7c07c 100755 --- a/tests/bugs/iges/buc60820_1 +++ b/tests/bugs/iges/buc60820_1 @@ -12,5 +12,5 @@ tclean result incmesh result 0.1 triangles result -checktrinfo result -tri 748 -nod 619 +checktrinfo result -tri 736 -nod 613 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/iges/buc60820_2 b/tests/bugs/iges/buc60820_2 index e030c94fcb..0c676d4af6 100755 --- a/tests/bugs/iges/buc60820_2 +++ b/tests/bugs/iges/buc60820_2 @@ -13,6 +13,6 @@ vdisplay result vsetdispmode result 1 vfit -checktrinfo result -tri 278 -nod 254 +checktrinfo result -tri 222 -nod 226 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25287 b/tests/bugs/mesh/bug25287 index 2905c18057..f03a9626d1 100644 --- a/tests/bugs/mesh/bug25287 +++ b/tests/bugs/mesh/bug25287 @@ -11,7 +11,7 @@ renamevar a_1 result incmesh result 0.0001 -a 30 -force_face_def -parallel -checktrinfo result -tri 14494 -nod 9510 -defl 0.00031502118964205414 -tol_abs_defl 1e-6 +checktrinfo result -tri 14058 -nod 9292 -defl 0.00031502118964205414 -tol_abs_defl 1e-6 vinit vsetdispmode 1 diff --git a/tests/bugs/mesh/bug27384_2 b/tests/bugs/mesh/bug27384_2 index 640c5ca59a..63e2923e22 100644 --- a/tests/bugs/mesh/bug27384_2 +++ b/tests/bugs/mesh/bug27384_2 @@ -17,7 +17,7 @@ vdefaults -autoTriang 0 vdisplay result vfit -set rel_tol 0.7607262575544315 +set rel_tol 0.7558889057543047 set max_rel_tol_diff 0.001 set area_eps 1 diff --git a/tests/bugs/mesh/bug27845 b/tests/bugs/mesh/bug27845 index 5428d732a7..6287701923 100644 --- a/tests/bugs/mesh/bug27845 +++ b/tests/bugs/mesh/bug27845 @@ -14,7 +14,7 @@ vdisplay result vfit checkview -screenshot -3d -path ${imagedir}/${test_image}.png -checktrinfo result -tri 3832 -nod 4773 -defl 3.0509255143612428 -tol_abs_defl 1e-6 +checktrinfo result -tri 3828 -nod 4771 -defl 3.0544822246414993 -tol_abs_defl 1e-6 set log [tricheck result] if { [llength $log] != 0 } { diff --git a/tests/bugs/mesh/bug30008_1 b/tests/bugs/mesh/bug30008_1 index add7ddfaab..0d6ccc4a9b 100644 --- a/tests/bugs/mesh/bug30008_1 +++ b/tests/bugs/mesh/bug30008_1 @@ -12,6 +12,6 @@ vdisplay result vviewparams -scale 8.46292 -proj 0.653203 -0.644806 0.396926 -up -0.0109833 0.51609 0.856464 -at 347.559 1026.89 219.262 -eye 2080.75 -684.022 1272.45 tricheck result -checktrinfo result -tri 9470 -nod 6136 -defl 4.7757836297551908 -tol_abs_defl 1e-6 +checktrinfo result -tri 9460 -nod 6131 -defl 4.7757836297551908 -tol_abs_defl 1e-6 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug31251 b/tests/bugs/mesh/bug31251 index d8693fe8e2..9a4c55cfb3 100644 --- a/tests/bugs/mesh/bug31251 +++ b/tests/bugs/mesh/bug31251 @@ -15,7 +15,7 @@ vdefaults -autoTriang 0 tclean result incmesh result 0.004 -a 14 -checktrinfo result -tri 72570 -nod 40951 -defl 0.24607185555570676 -tol_abs_defl 1e-6 +checktrinfo result -tri 72562 -nod 40947 -defl 0.24607185555570676 -tol_abs_defl 1e-6 vdisplay result -redisplay vfit @@ -23,7 +23,7 @@ checkview -screenshot -3d -path ${imagedir}/${test_image}_default.png tclean result incmesh result 0.004 -a 14 -force_face_def -checktrinfo result -tri 287990 -nod 148661 -defl 0.16388671063364907 -tol_abs_defl 1e-6 +checktrinfo result -tri 287982 -nod 148657 -defl 0.16388671063364907 -tol_abs_defl 1e-6 vdisplay result -redisplay vfit diff --git a/tests/bugs/mesh/bug32424 b/tests/bugs/mesh/bug32424 index f5e12302e1..deb41d8bfa 100644 --- a/tests/bugs/mesh/bug32424 +++ b/tests/bugs/mesh/bug32424 @@ -8,7 +8,7 @@ restore [locate_data_file bug32424.brep] result incmesh result 0.17 -a 20 -checktrinfo result -tri 16168 -nod 8206 +checktrinfo result -tri 2360 -nod 1302 vinit vdefaults -autoTriang 0 diff --git a/tests/bugs/modalg_2/bug264_11 b/tests/bugs/modalg_2/bug264_11 index a733dbcb47..eda4fb2af3 100755 --- a/tests/bugs/modalg_2/bug264_11 +++ b/tests/bugs/modalg_2/bug264_11 @@ -18,6 +18,6 @@ vclear isos result 0 triangles result -checktrinfo result -tri 31 -nod 28 +checktrinfo result -tri 55 -nod 40 checkprops result -s 0 checkview -display result -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/moddata_2/bug428 b/tests/bugs/moddata_2/bug428 index d4cce3e9f8..913bb19935 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 10463 -nod 7643 +checktrinfo result -tri 10409 -nod 7615 checkview -screenshot -2d -path ${imagedir}/${test_image}_axo.png diff --git a/tests/bugs/moddata_2/fra62476_1 b/tests/bugs/moddata_2/fra62476_1 index 92646513ab..d06f426a18 100755 --- a/tests/bugs/moddata_2/fra62476_1 +++ b/tests/bugs/moddata_2/fra62476_1 @@ -1,5 +1,4 @@ puts "TODO OCC12345 ALL: Error: Number of triangles" -puts "TODO OCC12345 ALL: Error: Number of nodes" puts "============" puts "FRA62476" diff --git a/tests/bugs/moddata_2/fra62476_2 b/tests/bugs/moddata_2/fra62476_2 index a9c53d81e0..07a7bef755 100755 --- a/tests/bugs/moddata_2/fra62476_2 +++ b/tests/bugs/moddata_2/fra62476_2 @@ -13,5 +13,5 @@ tclean result incmesh result .1 triangles result -checktrinfo result -tri 163 -nod 114 +checktrinfo result -tri 159 -nod 112 checkview -display result -3d -path ${imagedir}/${test_image}.png diff --git a/tests/hlr/poly_hlr/C13 b/tests/hlr/poly_hlr/C13 index bd4cf9a1cc..6a502fbb74 100644 --- a/tests/hlr/poly_hlr/C13 +++ b/tests/hlr/poly_hlr/C13 @@ -1,5 +1,5 @@ set viewname "vright" -set length 9548.13 +set length 9547.12 testreadstep [locate_data_file bug27341_Assembly_ABS_1_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C14 b/tests/hlr/poly_hlr/C14 index c49df14909..f76cc9ee72 100644 --- a/tests/hlr/poly_hlr/C14 +++ b/tests/hlr/poly_hlr/C14 @@ -1,5 +1,5 @@ set viewname "vright" -set length 5497.6 +set length 5501.45 testreadstep [locate_data_file bug27341_Assembly_BILZ_WFL2_1_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C16 b/tests/hlr/poly_hlr/C16 index 21f8c48b6c..4c2ecbe5c2 100644 --- a/tests/hlr/poly_hlr/C16 +++ b/tests/hlr/poly_hlr/C16 @@ -1,5 +1,5 @@ set viewname "vright" -set length 1662.87 +set length 1662.85 testreadstep [locate_data_file bug27341_CCS_Adapter_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C20 b/tests/hlr/poly_hlr/C20 index 0697995c73..ae4a9db262 100644 --- a/tests/hlr/poly_hlr/C20 +++ b/tests/hlr/poly_hlr/C20 @@ -1,5 +1,5 @@ set viewname "vright" -set length 1704.6 +set length 1704.86 testreadstep [locate_data_file bug27341_Drehkopf_HSK_Gewinde_R_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C5 b/tests/hlr/poly_hlr/C5 index 140df6fbfd..1c072cb09d 100644 --- a/tests/hlr/poly_hlr/C5 +++ b/tests/hlr/poly_hlr/C5 @@ -1,5 +1,5 @@ set viewname "vright" -set length 1718.9 +set length 1723.27 testreadstep [locate_data_file bug27341_ABS_Adapter_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C6 b/tests/hlr/poly_hlr/C6 index b63823c549..e0ad37efcc 100644 --- a/tests/hlr/poly_hlr/C6 +++ b/tests/hlr/poly_hlr/C6 @@ -1,5 +1,5 @@ set viewname "vright" -set length 2832.05 +set length 2832.09 testreadstep [locate_data_file bug27341_ABS_Grundhalter_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/C7 b/tests/hlr/poly_hlr/C7 index 76688f7cad..802b51a028 100644 --- a/tests/hlr/poly_hlr/C7 +++ b/tests/hlr/poly_hlr/C7 @@ -1,5 +1,5 @@ set viewname "vright" -set length 2261.81 +set length 2262.59 testreadstep [locate_data_file bug27341_AIF_Grundhalter_GR1_CAD.stp] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/bug23625_2 b/tests/hlr/poly_hlr/bug23625_2 index 8ae9139745..09558857a0 100644 --- a/tests/hlr/poly_hlr/bug23625_2 +++ b/tests/hlr/poly_hlr/bug23625_2 @@ -4,7 +4,7 @@ puts "============" puts "" set viewname "vfront" -set length 27126.9 +set length 27223.1 restore [locate_data_file bug23625_a2.brep] a COMPUTE_HLR $viewname $algotype diff --git a/tests/mesh/data/standard/X1 b/tests/mesh/data/standard/X1 index d09c119532..fc5a589950 100755 --- a/tests/mesh/data/standard/X1 +++ b/tests/mesh/data/standard/X1 @@ -6,7 +6,7 @@ set TheFileName shading_wrongshape_030.brep set bug_cross "OCC22687" set nbcross(All) 4 if { [string compare $command "shading"] == 0 } { - set rel_tol 0.48575382373356474 + set rel_tol 0.4953655446472135 } else { set rel_tol 0.1856053577754922 }