From 7d5e26eb2e1a2ad231784931626665c6b3eea19d Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Wed, 29 Sep 2021 22:03:26 +0300 Subject: [PATCH] 0032596: [REGRESSION] Data Exchange, STEP Reader - OCCT 7.6.0dev does not open file correctly Fixed typo in the StepToTopoDS_TranslateFace.cxx after #29564 issue --- .../StepToTopoDS_TranslateFace.cxx | 11 ++++++----- tests/bugs/step/bug32596 | 18 ++++++++++++++++++ tests/de/step_1/E6 | 7 +++++-- tests/de/step_2/A3 | 9 ++++++--- tests/de/step_2/A5 | 7 +++++-- tests/de/step_2/D2 | 7 +++++-- 6 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 tests/bugs/step/bug32596 diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateFace.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateFace.cxx index bcb083956b..b31b6e5812 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateFace.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateFace.cxx @@ -256,16 +256,17 @@ void StepToTopoDS_TranslateFace::Init // "If the face has only one bound and this is of type vertex_loop, then the interior of the face is the domain of the face_surface.face_geometry. // In such a case the underlying surface shall be closed (e.g. a spherical_surface.)" // - natural bounds are applied only in case if VertexLoop is only the one defined face bound. - if (NbBnd == 1) { + if (NbBnd == 1) + { BRepBuilderAPI_MakeFace mf(GeomSurf, Precision()); for (TopoDS_Iterator it(mf); it.More(); it.Next()) + { B.Add(F, it.Value()); - + } + continue; } - continue; - } - + if (GeomSurf->IsKind(STANDARD_TYPE(Geom_ToroidalSurface))) { continue; } diff --git a/tests/bugs/step/bug32596 b/tests/bugs/step/bug32596 new file mode 100644 index 0000000000..fd91cb4748 --- /dev/null +++ b/tests/bugs/step/bug32596 @@ -0,0 +1,18 @@ +puts "====================================" +puts "0032596: \[REGRESSION\] Data Exchange, STEP Reader - OCCT 7.6.0dev does not open file correctly" +puts "====================================" +puts "" + +# Read file +testreadstep [locate_data_file bug32596_abc_0_13.step] res + +checkshape res +checknbshapes res -face 99 -wire 118 -edge 232 -vertex 144 + +vinit View1 +vright +vdisplay -dispMode 1 res +vfit +if { [vreadpixel 200 200 -rgb -name] != "BLACK" } { + puts "Error: Incorrect shape" +} diff --git a/tests/de/step_1/E6 b/tests/de/step_1/E6 index 7cb558bba9..889d27bab5 100755 --- a/tests/de/step_1/E6 +++ b/tests/de/step_1/E6 @@ -1,13 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + set filename trj4_s1-ai-214.stp set ref_data { DATA : Faulties = 0 ( 54 ) Warnings = 0 ( 0 ) Summary = 0 ( 54 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 2 ( 51 ) Summary = 2 ( 51 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 53 ) Summary = 6 ( 53 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 8 ( 8 ) Shell = 8 ( 8 ) Face = 104 ( 104 ) STATSHAPE : Solid = 8 ( 8 ) Shell = 8 ( 8 ) Face = 104 ( 104 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 0.0007308806138 ( 0.002238556699 ) AvgTol = 1.588300578e-005 ( 3.376756081e-005 ) +TOLERANCE : MaxTol = 0.949881784 ( 0.002238556699 ) AvgTol = 0.05811636349 ( 3.300213579e-005 ) LABELS : N0Labels = 9 ( 9 ) N1Labels = 8 ( 8 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 17 ( 17 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_2/A3 b/tests/de/step_2/A3 index d3a584649a..45ea4486d3 100755 --- a/tests/de/step_2/A3 +++ b/tests/de/step_2/A3 @@ -1,16 +1,19 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + set filename tr9_r0501-ug.stp -# set in as local length unit +# set in as local lenght unit set lengthunit_start "in" set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 403 ) Summary = 6 ( 403 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 7 ( 403 ) Summary = 7 ( 403 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 532 ( 532 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 532 ( 532 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 1e-005 ( 1.238532849e-005 ) AvgTol = 2.427533179e-007 ( 6.244877739e-006 ) +TOLERANCE : MaxTol = 0.000282013979 ( 1.238532849e-005 ) AvgTol = 1.523260819e-006 ( 6.244877739e-006 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_2/A5 b/tests/de/step_2/A5 index c89d6bcb6e..fdd8a3a5bd 100755 --- a/tests/de/step_2/A5 +++ b/tests/de/step_2/A5 @@ -1,13 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + set filename r86ug.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 4 ( 127 ) Summary = 4 ( 127 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 7 ( 143 ) Summary = 7 ( 143 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 25 ( 25 ) Shell = 25 ( 25 ) Face = 476 ( 476 ) STATSHAPE : Solid = 25 ( 25 ) Shell = 25 ( 25 ) Face = 476 ( 476 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 8.47188394e-006 ( 1.437435657e-005 ) AvgTol = 5.284196224e-007 ( 2.390274944e-006 ) +TOLERANCE : MaxTol = 0.01183950282 ( 1.437435657e-005 ) AvgTol = 4.445309917e-005 ( 2.420891776e-006 ) LABELS : N0Labels = 16 ( 16 ) N1Labels = 15 ( 15 ) N2Labels = 0 ( 0 ) TotalLabels = 31 ( 31 ) NameLabels = 31 ( 31 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_2/D2 b/tests/de/step_2/D2 index 57c69ff184..f2c215d3d9 100755 --- a/tests/de/step_2/D2 +++ b/tests/de/step_2/D2 @@ -1,13 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + set filename trj5_pm3-ug-203.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 82 ) Summary = 8 ( 82 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 7 ( 83 ) Summary = 7 ( 83 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 18 ( 18 ) Shell = 18 ( 18 ) Face = 369 ( 369 ) STATSHAPE : Solid = 18 ( 18 ) Shell = 18 ( 18 ) Face = 369 ( 369 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 0.005929066011 ( 0.01678530642 ) AvgTol = 9.716756634e-005 ( 0.0001556337239 ) +TOLERANCE : MaxTol = 0.07714530523 ( 0.01678530642 ) AvgTol = 0.0009065081658 ( 0.0001538088659 ) LABELS : N0Labels = 20 ( 20 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 39 ( 39 ) NameLabels = 39 ( 39 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 20 ( 20 ) Volume = 20 ( 20 ) Area = 20 ( 20 ) NCOLORS : NColors = 0 ( 0 )