0024983: For the incorrect seam edge in STEP file no fix is provided

fix the notched edges twice per face - before checking for missing seam and after
Test case correction for issue CR24983
Add check for invalid Surface of linear extrusion (with basis curve - line and extrusion direction parallel to this line) during converting STEP surface
Small corrections of test cases for issue CR24983

diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index bcac2ebe375b32a42193457e18ecb6fb71523a19..96d8bb2d299179e002809ff6ee207e30284a4236 100644 (file)
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -383,10 +383,10 @@ Standard_Boolean ShapeFix_Face::Perform()
     theAdvFixWire->SetFace ( myFace );
     
     Standard_Integer usFixLackingMode = theAdvFixWire->FixLackingMode();
-    Standard_Integer usFixNotchedEdgesMode = theAdvFixWire->FixNotchedEdgesMode();
+    //Standard_Integer usFixNotchedEdgesMode = theAdvFixWire->FixNotchedEdgesMode(); // CR0024983
     Standard_Integer usFixSelfIntersectionMode = theAdvFixWire->FixSelfIntersectionMode();
     theAdvFixWire->FixLackingMode() = Standard_False;
-    theAdvFixWire->FixNotchedEdgesMode() = Standard_False;
+    //theAdvFixWire->FixNotchedEdgesMode() = Standard_False; // CR0024983
     theAdvFixWire->FixSelfIntersectionMode() = Standard_False;
     
     Standard_Boolean fixed = Standard_False; 
@@ -459,6 +459,7 @@ Standard_Boolean ShapeFix_Face::Perform()
         fixed = (theAdvFixWire->StatusSmall(ShapeExtend_DONE) || 
                theAdvFixWire->StatusConnected(ShapeExtend_DONE) ||
                theAdvFixWire->StatusEdgeCurves(ShapeExtend_DONE) ||
+               theAdvFixWire->StatusNotches(ShapeExtend_DONE) ||  // CR0024983
                theAdvFixWire->StatusDegenerated(ShapeExtend_DONE) ||
                theAdvFixWire->StatusClosed(ShapeExtend_DONE));
         TopoDS_Wire w = theAdvFixWire->Wire();
@@ -480,7 +481,7 @@ Standard_Boolean ShapeFix_Face::Perform()
     }
     
     theAdvFixWire->FixLackingMode() = usFixLackingMode;
-    theAdvFixWire->FixNotchedEdgesMode() = usFixNotchedEdgesMode;
+    //theAdvFixWire->FixNotchedEdgesMode() = usFixNotchedEdgesMode;  // CR0024983
     theAdvFixWire->FixSelfIntersectionMode() = usFixSelfIntersectionMode;
     if ( ! myFwd ) tmpFace.Orientation ( TopAbs_REVERSED );
     

diff --git a/src/StepToGeom/StepToGeom_MakeSurfaceOfLinearExtrusion.cxx b/src/StepToGeom/StepToGeom_MakeSurfaceOfLinearExtrusion.cxx
index 29d40e637c03d4a3b31f0791f4dd9987a2ec09c6..57a7c6da04cfc8d732c854f422a52ffff05173af 100644 (file)
--- a/src/StepToGeom/StepToGeom_MakeSurfaceOfLinearExtrusion.cxx
+++ b/src/StepToGeom/StepToGeom_MakeSurfaceOfLinearExtrusion.cxx
@@ -22,9 +22,12 @@
 #include <Geom_VectorWithMagnitude.hxx>
 #include <StepToGeom_MakeVectorWithMagnitude.hxx>
 #include <Geom_Curve.hxx>
+#include <Geom_Line.hxx>
 #include <StepToGeom_MakeCurve.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Dir.hxx>
+#include <gp_Lin.hxx>
+#include <Precision.hxx>
 
 //=============================================================================
 // Creation d' une SurfaceOfLinearExtrusion de Geom a partir d' une
@@ -42,6 +45,9 @@ Standard_Boolean StepToGeom_MakeSurfaceOfLinearExtrusion::Convert (const Handle(
     if (StepToGeom_MakeVectorWithMagnitude::Convert(SS->ExtrusionAxis(),V))
     {
       const gp_Dir D(V->Vec());
+      Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(C);
+      if (!aLine.IsNull() && aLine->Lin().Direction().IsParallel(D, Precision::Angular()))
+        return Standard_False;
       CS = new Geom_SurfaceOfLinearExtrusion(C,D);
       return Standard_True;
     }

diff --git a/tests/bugs/heal/bug24983 b/tests/bugs/heal/bug24983
new file mode 100644 (file)
index 0000000..241db97
--- /dev/null
+++ b/tests/bugs/heal/bug24983
@@ -0,0 +1,11 @@
+puts "========"
+puts "0024983: For the incorrect seam edge in STEP file no fix is provided"
+puts "========"
+
+stepread [locate_data_file bug24983_111FACE.stp] a *
+
+tpcompound result
+checkshape result
+
+set 2dviewer 0
+

diff --git a/tests/de/iges_1/G9 b/tests/de/iges_1/G9
old mode 100644 (file)
new mode 100755 (executable)
index 637b2d5..56a4441
--- a/tests/de/iges_1/G9
+++ b/tests/de/iges_1/G9
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 164  ( 4127 )  Summary  = 164  ( 4127 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 448  ( 448 )   Summary  = 7239  ( 7237 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 448  ( 448 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3193  ( 3192 )
-TOLERANCE   : MaxTol   =  0.08683083502  (  0.04341528762 )  AvgTol   =  0.0008697844744  (  0.0007558849075 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 448  ( 448 )   Summary  = 7237  ( 7237 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 448  ( 448 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3192  ( 3192 )
+TOLERANCE   : MaxTol   =  0.08683083502  (  0.04341528762 )  AvgTol   =  0.0008700419523  (  0.0007558849075 )
 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 )

diff --git a/tests/de/iges_1/I3 b/tests/de/iges_1/I3
old mode 100644 (file)
new mode 100755 (executable)
index f6f8b43..d7ebcfc
--- a/tests/de/iges_1/I3
+++ b/tests/de/iges_1/I3
@@ -6,12 +6,12 @@ set filename BUC60800.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 9 )  Summary  = 0  ( 9 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 8 )  Summary  = 0  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 248  ( 248 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 123  ( 123 )
-TOLERANCE   : MaxTol   =         1e-007  ( 1.000269908e-007 )  AvgTol   =          1e-007  (  1.000005471e-007 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 123 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 124 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 124 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 244  ( 244 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 121  ( 121 )
+TOLERANCE   : MaxTol   =          1e-07  ( 1.000369935e-07 )  AvgTol   =           1e-07  (  1.000003506e-07 )
+LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 121 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 122 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 122 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
 COLORS      : Colors   = WHITE  ( WHITE )

diff --git a/tests/de/iges_1/M6 b/tests/de/iges_1/M6
old mode 100644 (file)
new mode 100755 (executable)
index e8e807d..832cbe6
--- a/tests/de/iges_1/M6
+++ b/tests/de/iges_1/M6
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 153  ( 2026 )  Summary  = 153  ( 2026 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 532  ( 532 )   Summary  = 12701  ( 12704 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 532  ( 532 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 5826  ( 5828 )
-TOLERANCE   : MaxTol   =    0.888818095  (   0.8888180952 )  AvgTol   =   0.02520286235  (   0.02519878248 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 532  ( 532 )   Summary  = 12701  ( 12702 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 532  ( 532 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 5826  ( 5827 )
+TOLERANCE   : MaxTol   =    0.888818095  (   0.8888180952 )  AvgTol   =   0.02520281804  (   0.02520274804 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 534  ( 4023 )  N2Labels = 0  ( 0 )   TotalLabels = 535  ( 4024 )   NameLabels = 535  ( 833 )   ColorLabels = 534  ( 4023 )   LayerLabels = 532  ( 4021 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )

diff --git a/tests/de/iges_1/O5 b/tests/de/iges_1/O5
old mode 100644 (file)
new mode 100755 (executable)
index c07a393..d9b250f
--- a/tests/de/iges_1/O5
+++ b/tests/de/iges_1/O5
@@ -1,16 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-
 
 set filename lh93wsddr3370z2.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 248  ( 6306 )  Summary  = 248  ( 6306 )
-CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 685  ( 685 )   Summary  = 10605  ( 10601 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 685  ( 685 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4637  ( 4635 )
-TOLERANCE   : MaxTol   =  0.03464832644  (  0.08716146716 )  AvgTol   =  0.0001815200075  (  0.0002025375566 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 246  ( 6306 )  Summary  = 246  ( 6306 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 685  ( 685 )   Summary  = 10601  ( 10601 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 685  ( 685 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4635  ( 4635 )
+TOLERANCE   : MaxTol   =  0.03464832644  (  0.08716146716 )  AvgTol   =  0.0001792027306  (  0.0002025375566 )
 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 )

diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4
index 2bff558586450fa45064192ad5f2d29733b78e4f..030d77b60b43b061043d4552c9fa664deb2a332e 100755 (executable)
--- a/tests/de/iges_2/F4
+++ b/tests/de/iges_2/F4
@@ -1,22 +1,17 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
-
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
-
 set LinuxDiff 2
 set filename buc60894.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 30  ( 36 )  Warnings = 570  ( 1854 )  Summary  = 600  ( 1890 )
-CHECKSHAPE  : Wires    = 7  ( 6 )  Faces    = 7  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3500  ( 3499 )   Summary  = 43162  ( 43109 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3500  ( 3499 )   FreeWire = 0  ( 0 )   FreeEdge  = 164 ( 164 )   SharedEdge = 18145  ( 18117 )
-TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02459126458  (   0.02803193293 )
+TPSTAT      : Faulties = 30  ( 36 )  Warnings = 559  ( 1854 )  Summary  = 589  ( 1890 )
+CHECKSHAPE  : Wires    = 5  ( 6 )  Faces    = 5  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3499  ( 3499 )   Summary  = 43148  ( 43109 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3499  ( 3499 )   FreeWire = 0  ( 0 )   FreeEdge  = 164 ( 164 )   SharedEdge = 18139  ( 18117 )
+TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02460215735  (   0.02803309188 )
 LABELS      : N0Labels = 12  ( 30 )  N1Labels = 3661  ( 3666 )  N2Labels = 0  ( 0 )   TotalLabels = 3673  ( 3696 )   NameLabels = 1379  ( 3694 )   ColorLabels = 3661  ( 3662 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 10  ( 11 )

diff --git a/tests/de/iges_2/G4 b/tests/de/iges_2/G4
old mode 100644 (file)
new mode 100755 (executable)
index 89c6d16..19b9003
--- a/tests/de/iges_2/G4
+++ b/tests/de/iges_2/G4
@@ -10,12 +10,12 @@ set filename y306351f.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 160  ( 1956 )  Summary  = 160  ( 1956 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 390 )   Summary  = 57074  ( 57071 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 390 )   FreeWire = 0  ( 0 )   FreeEdge  = 1134 ( 1134 )   SharedEdge = 27578  ( 27578 )
-TOLERANCE   : MaxTol   =  0.01225276587  (  0.01225276466 )  AvgTol   =  0.0001845682826  (  0.0001846397195 )
-LABELS      : N0Labels = 1524  ( 1524 )  N1Labels = 0  ( 26430 )  N2Labels = 0  ( 0 )   TotalLabels = 1524  ( 27954 )   NameLabels = 1524  ( 1530 )   ColorLabels = 1497  ( 27954 )   LayerLabels = 1107  ( 1134 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 160  ( 1955 )  Summary  = 160  ( 1955 )
+CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 390 )   Summary  = 57070  ( 57068 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 390 )   FreeWire = 0  ( 0 )   FreeEdge  = 1134 ( 1134 )   SharedEdge = 27576  ( 27576 )
+TOLERANCE   : MaxTol   =  0.01225276587  (  0.01225276466 )  AvgTol   =  0.0001845815979  (  0.0001846530408 )
+LABELS      : N0Labels = 1524  ( 1524 )  N1Labels = 0  ( 26428 )  N2Labels = 0  ( 0 )   TotalLabels = 1524  ( 27952 )   NameLabels = 1524  ( 1530 )   ColorLabels = 1497  ( 27952 )   LayerLabels = 1107  ( 1134 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
 COLORS      : Colors   = CYAN1 WHITE  ( CYAN1 WHITE )

diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9
old mode 100644 (file)
new mode 100755 (executable)
index 509eb71..af815a8
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -15,12 +15,12 @@ set filename coque-sup.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 3 )  Warnings = 277  ( 4464 )  Summary  = 277  ( 4467 )
-CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 2  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1627  ( 1627 )   Summary  = 39249  ( 39256 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1627  ( 1627 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17934  ( 17935 )
-TOLERANCE   : MaxTol   =    1.006358087  (    992.8187669 )  AvgTol   =  0.0004397450356  (    0.3174630609 )
-LABELS      : N0Labels = 6  ( 6 )  N1Labels = 1642  ( 9638 )  N2Labels = 0  ( 0 )   TotalLabels = 1648  ( 9644 )   NameLabels = 1648  ( 2887 )   ColorLabels = 1644  ( 9643 )   LayerLabels = 488  ( 3995 )
+TPSTAT      : Faulties = 0  ( 3 )  Warnings = 274  ( 4465 )  Summary  = 274  ( 4468 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 3  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1627  ( 1627 )   Summary  = 39245  ( 39252 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1627  ( 1627 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17932  ( 17933 )
+TOLERANCE   : MaxTol   =   0.1961320506  (    992.8187669 )  AvgTol   =  0.0003490038155  (    0.2648369601 )
+LABELS      : N0Labels = 6  ( 6 )  N1Labels = 1642  ( 9636 )  N2Labels = 0  ( 0 )   TotalLabels = 1648  ( 9642 )   NameLabels = 1648  ( 2888 )   ColorLabels = 1644  ( 9641 )   LayerLabels = 488  ( 3995 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 5 )
 COLORS      : Colors   = BLUE1 CYAN1 GOLD3 GREEN  ( BLUE1 CYAN1 GOLD3 GREEN YELLOW )

diff --git a/tests/de/iges_3/A2 b/tests/de/iges_3/A2
index f306a8e9b46dd97b07d6c789ba288a788fea74a5..b69a4c8f986318d89af5b06e9c2756df3aaf5f7c 100755 (executable)
--- a/tests/de/iges_3/A2
+++ b/tests/de/iges_3/A2
@@ -13,12 +13,12 @@ set filename UKI60094.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 4  ( 33 )  Warnings = 124  ( 321 )  Summary  = 128  ( 354 )
-CHECKSHAPE  : Wires    = 1  ( 2 )  Faces    = 4  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 424  ( 159 )   Summary  = 7865  ( 4458 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 424  ( 419 )   FreeWire = 66  ( 114 )   FreeEdge  = 430 ( 430 )   SharedEdge = 3353  ( 1895 )
-TOLERANCE   : MaxTol   =    3.181989255  (    2716.882548 )  AvgTol   =  0.008643189151  (     4.445642549 )
-LABELS      : N0Labels = 3  ( 3 )  N1Labels = 325  ( 1834 )  N2Labels = 0  ( 0 )   TotalLabels = 328  ( 1837 )   NameLabels = 328  ( 425 )   ColorLabels = 325  ( 1834 )   LayerLabels = 193  ( 1569 )
+TPSTAT      : Faulties = 4  ( 33 )  Warnings = 125  ( 319 )  Summary  = 129  ( 352 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 2  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 420  ( 159 )   Summary  = 7849  ( 4452 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 420  ( 419 )   FreeWire = 66  ( 114 )   FreeEdge  = 430 ( 430 )   SharedEdge = 3347  ( 1892 )
+TOLERANCE   : MaxTol   =    3.181671051  (    2716.882548 )  AvgTol   =  0.008547757257  (     3.678737151 )
+LABELS      : N0Labels = 3  ( 3 )  N1Labels = 325  ( 1833 )  N2Labels = 0  ( 0 )   TotalLabels = 328  ( 1836 )   NameLabels = 328  ( 424 )   ColorLabels = 325  ( 1833 )   LayerLabels = 193  ( 1568 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 7 )
 COLORS      : Colors   = GREEN MATRABLUE RED RED4 WHITE YELLOW  ( GREEN MAGENTA1 MATRABLUE RED RED4 WHITE YELLOW )

diff --git a/tests/de/step_2/F1 b/tests/de/step_2/F1
old mode 100644 (file)
new mode 100755 (executable)
index 7425f01..6260234
--- a/tests/de/step_2/F1
+++ b/tests/de/step_2/F1
@@ -1,24 +1,17 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 ALL: LABELS : Faulty" 
-
-
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename bm4_sd_punch_c.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 43  ( 3 )  Summary  = 43  ( 3 )
-CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 5  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 205  ( 204 )   Summary  = 1360  ( 1361 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 205  ( 204 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 550  ( 551 )
-TOLERANCE   : MaxTol   =    1.533009737  (    1.627860152 )  AvgTol   =   0.07406624263  (   0.08379380903 )
-LABELS      : N0Labels = 5  ( 5 )  N1Labels = 42  ( 41 )  N2Labels = 0  ( 0 )   TotalLabels = 47  ( 46 )   NameLabels = 9  ( 9 )   ColorLabels = 42  ( 41 )   LayerLabels = 0  ( 0 )
+TPSTAT      : Faulties = 0  ( 6 )  Warnings = 10  ( 6 )  Summary  = 10  ( 12 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 198  ( 198 )   Summary  = 1355  ( 1355 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 198  ( 198 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 554  ( 554 )
+TOLERANCE   : MaxTol   = 6.149434256e-07  ( 6.149442686e-07 )  AvgTol   =  1.401960047e-07  (  1.401957861e-07 )
+LABELS      : N0Labels = 5  ( 5 )  N1Labels = 35  ( 35 )  N2Labels = 0  ( 0 )   TotalLabels = 40  ( 40 )   NameLabels = 9  ( 9 )   ColorLabels = 35  ( 35 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
 COLORS      : Colors   = BLUE1 GREEN RED  ( BLUE1 GREEN RED )

diff --git a/tests/de/step_2/W2 b/tests/de/step_2/W2
old mode 100644 (file)
new mode 100755 (executable)
index a312c14..89040f3
--- a/tests/de/step_2/W2
+++ b/tests/de/step_2/W2
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
 
 set filename bm4_sd_eye_c.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 1 )  Summary  = 7  ( 1 )
-CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 82  ( 82 )   Summary  = 472  ( 476 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 82  ( 82 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 197  ( 199 )
-TOLERANCE   : MaxTol   =    2.828738262  (    2.828738262 )  AvgTol   =    0.2828527659  (    0.3313547178 )
+TPSTAT      : Faulties = 0  ( 4 )  Warnings = 0  ( 4 )  Summary  = 0  ( 8 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   Summary  = 467  ( 467 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 199  ( 199 )
+TOLERANCE   : MaxTol   = 7.174253459e-07  ( 7.174254492e-07 )  AvgTol   =  2.394980588e-07  (  2.394974547e-07 )
 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 )