From: ika Date: Thu, 15 Aug 2013 11:28:19 +0000 (+0400) Subject: 0022535: Cut sphere: invalid shape after reading from STEP X-Git-Tag: V6_7_0_beta~176 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=602952413f461e5141c54fdc30c6a26401e02349;p=occt-copy.git 0022535: Cut sphere: invalid shape after reading from STEP In cutting sphere it's seam edge was divided into two parts(by cylinder), but pcurves of the second were not shifted during shape healing. Test cases correction --- diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx index b17d699248..4d07225a73 100755 --- a/src/ShapeFix/ShapeFix_Wire.cxx +++ b/src/ShapeFix/ShapeFix_Wire.cxx @@ -1448,9 +1448,9 @@ Standard_Boolean ShapeFix_Wire::FixShifted() #ifdef DEB cout << "Info: ShapeFix_Wire::FixShifted(): bi - meridian case fixed" << endl; #endif + continue; } // degn2 = n2; pdeg = p; // ie_exhaust-A.stp #37520 - continue; } /* // pdn to fix half sphere diff --git a/tests/bugs/xde/bug22535_1 b/tests/bugs/xde/bug22535_1 index 2ff9b4a96f..f958faa47b 100755 --- a/tests/bugs/xde/bug22535_1 +++ b/tests/bugs/xde/bug22535_1 @@ -1,6 +1,3 @@ -puts "TODO OCC11111 ALL: Error : Result shape is WRONG" -puts "TODO OCC11111 ALL: Error : The square of result shape is" - puts "===========" puts "OCC22535" puts "===========" @@ -28,7 +25,7 @@ set nb_f_good 2 set nb_sh_good 1 set nb_sol_good 1 set nb_compsol_good 0 -set nb_compound_good 1 -set nb_shape_good 23 +set nb_compound_good 0 +set nb_shape_good 22 set 3dviewer 1 diff --git a/tests/bugs/xde/bug22535_2 b/tests/bugs/xde/bug22535_2 index 8e964f5863..bc216c97d6 100755 --- a/tests/bugs/xde/bug22535_2 +++ b/tests/bugs/xde/bug22535_2 @@ -1,6 +1,3 @@ -puts "TODO OCC11111 ALL: Error : Result shape is WRONG" -puts "TODO OCC11111 ALL: Error : The square of result shape is" - puts "===========" puts "OCC22535" puts "===========" @@ -21,14 +18,14 @@ vfit set square 50201.3 -set nb_v_good 11 -set nb_e_good 23 +set nb_v_good 15 +set nb_e_good 24 set nb_w_good 9 set nb_f_good 8 set nb_sh_good 5 set nb_sol_good 4 set nb_compsol_good 0 -set nb_compound_good 5 -set nb_shape_good 65 +set nb_compound_good 1 +set nb_shape_good 66 set 3dviewer 1 diff --git a/tests/de/iges_2/H1 b/tests/de/iges_2/H1 old mode 100644 new mode 100755 index 9dd6c639e8..64c8b770ec --- a/tests/de/iges_2/H1 +++ b/tests/de/iges_2/H1 @@ -1,17 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" -puts "TODO CR23096 ALL: STATSHAPE : Faulty" set filename waaier_para.igs set ref_data { DATA : Faulties = 0 ( 1 ) Warnings = 0 ( 1 ) Summary = 0 ( 2 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 41 ( 617 ) Summary = 41 ( 617 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 40 ( 617 ) Summary = 40 ( 617 ) CHECKSHAPE : Wires = 2 ( 2 ) Faces = 3 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 163 ( 162 ) Summary = 4902 ( 4895 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 163 ( 162 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2290 ( 2288 ) -TOLERANCE : MaxTol = 0.9221218173 ( 0.9410156556 ) AvgTol = 0.01533181751 ( 0.01464237243 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 162 ( 162 ) Summary = 4900 ( 4895 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 162 ( 162 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2291 ( 2288 ) +TOLERANCE : MaxTol = 0.9221218176 ( 0.9410156556 ) AvgTol = 0.01501963159 ( 0.01437988687 ) LABELS : N0Labels = 162 ( 162 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 162 ( 162 ) NameLabels = 162 ( 162 ) ColorLabels = 162 ( 162 ) LayerLabels = 162 ( 162 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_1/J6 b/tests/de/step_1/J6 old mode 100644 new mode 100755 index 3aa36ce7f8..23bd9a250e --- a/tests/de/step_1/J6 +++ b/tests/de/step_1/J6 @@ -1,6 +1,10 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO ?CR23096 ALL: Error : 1 differences with reference data found :" -puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty" +puts "TODO CR23096 ALL: STATSHAPE : Faulty" + + +puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " + +puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" set LinuxDiff 2 set LinuxFaulties {STATSHAPE} @@ -8,11 +12,11 @@ set filename bm1_pe_t4.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 2 ) Warnings = 17 ( 27 ) Summary = 17 ( 29 ) -CHECKSHAPE : Wires = 2 ( 2 ) Faces = 3 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) Summary = 149 ( 149 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 59 ( 59 ) -TOLERANCE : MaxTol = 1562.051497 ( 1562.051497 ) AvgTol = 202.2827086 ( 209.6352005 ) +TPSTAT : Faulties = 0 ( 2 ) Warnings = 19 ( 27 ) Summary = 19 ( 29 ) +CHECKSHAPE : Wires = 2 ( 3 ) Faces = 2 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 13 ( 12 ) Face = 16 ( 15 ) Summary = 154 ( 151 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 13 ( 12 ) Face = 16 ( 15 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 59 ( 60 ) +TOLERANCE : MaxTol = 1562.051497 ( 1562.051497 ) AvgTol = 192.5735494 ( 206.7634854 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 )