From ed5ca017c73a0c9c2d644d093315874fe2c4f5a4 Mon Sep 17 00:00:00 2001 From: aml Date: Thu, 24 Sep 2015 15:01:44 +0300 Subject: [PATCH] 0026656: ShapeFix_Face introduces extremely high vertex tolerance in the input shape Added set of methods CopyVertex in BRepTools_ReShape. Usage of this non-modifying methods added in ShapeFix_Wire, ShapeFix_Edge. Test case for issue 26656. Test cases updated to the new behavior. Correction of test cases for issue CR26656 Changed access by value to access by reference in method CopyVertex. --- src/BRepTools/BRepTools_ReShape.cxx | 34 +++++ src/BRepTools/BRepTools_ReShape.hxx | 13 ++ src/ShapeFix/ShapeFix_Edge.cxx | 126 +++++++++++++----- src/ShapeFix/ShapeFix_Edge.hxx | 9 +- src/ShapeFix/ShapeFix_IntersectionTool.cxx | 2 +- src/ShapeFix/ShapeFix_Shape.cxx | 6 +- src/ShapeFix/ShapeFix_Wire.cxx | 78 +++++++++-- .../ShapeUpgrade_UnifySameDomain.cxx | 11 +- tests/bugs/heal/bug26656 | 27 ++++ tests/de/iges_1/G7 | 2 +- tests/de/iges_1/H6 | 2 +- tests/de/iges_1/H8 | 2 +- tests/de/iges_1/I1 | 2 +- tests/de/iges_1/J2 | 2 +- tests/de/iges_1/J3 | 2 +- tests/de/iges_1/J8 | 2 +- tests/de/iges_1/K2 | 2 +- tests/de/iges_1/K3 | 2 +- tests/de/iges_1/K9 | 2 +- tests/de/iges_1/L2 | 2 +- tests/de/iges_1/L5 | 2 +- tests/de/iges_1/L6 | 2 +- tests/de/iges_1/M2 | 2 +- tests/de/iges_1/M3 | 2 +- tests/de/iges_1/M6 | 2 +- tests/de/iges_1/M7 | 2 +- tests/de/iges_1/N3 | 2 +- tests/de/iges_1/N5 | 2 +- tests/de/iges_1/N7 | 2 +- tests/de/iges_1/P5 | 2 +- tests/de/iges_1/P7 | 2 +- tests/de/iges_1/Q3 | 2 +- tests/de/iges_1/Q4 | 2 +- tests/de/iges_1/Q5 | 3 +- tests/de/iges_1/Q6 | 2 +- tests/de/iges_1/R1 | 2 +- tests/de/iges_1/R4 | 2 +- tests/de/iges_1/R5 | 2 +- tests/de/iges_2/A4 | 2 +- tests/de/iges_2/A7 | 2 +- tests/de/iges_2/A9 | 6 +- tests/de/iges_2/B3 | 2 +- tests/de/iges_2/B8 | 2 +- tests/de/iges_2/C3 | 7 +- tests/de/iges_2/D1 | 3 +- tests/de/iges_2/E1 | 2 +- tests/de/iges_2/E3 | 2 +- tests/de/iges_2/E4 | 2 +- tests/de/iges_2/E6 | 2 +- tests/de/iges_2/E7 | 2 +- tests/de/iges_2/F3 | 2 +- tests/de/iges_2/F4 | 2 +- tests/de/iges_2/F9 | 2 +- tests/de/iges_2/G1 | 4 +- tests/de/iges_2/G8 | 2 +- tests/de/iges_2/G9 | 2 +- tests/de/iges_2/I3 | 2 +- tests/de/iges_2/I4 | 2 +- tests/de/iges_2/I5 | 2 +- tests/de/iges_2/I8 | 2 +- tests/de/iges_2/I9 | 2 +- tests/de/iges_3/A2 | 2 +- tests/de/iges_3/A3 | 2 +- tests/de/iges_3/A9 | 2 +- 64 files changed, 308 insertions(+), 121 deletions(-) create mode 100644 tests/bugs/heal/bug26656 diff --git a/src/BRepTools/BRepTools_ReShape.cxx b/src/BRepTools/BRepTools_ReShape.cxx index 824a63581e..8a9b683eff 100644 --- a/src/BRepTools/BRepTools_ReShape.cxx +++ b/src/BRepTools/BRepTools_ReShape.cxx @@ -573,3 +573,37 @@ Standard_Boolean& BRepTools_ReShape::ModeConsiderOrientation() { return myConsiderOrientation; } + +//======================================================================= +//function : CopyVertex +//purpose : +//======================================================================= + +TopoDS_Vertex BRepTools_ReShape::CopyVertex(const TopoDS_Vertex& theV, + const Standard_Real theTol) +{ + return CopyVertex(theV, BRep_Tool::Pnt(theV), theTol); +} + +//======================================================================= +//function : CopyVertex +//purpose : +//======================================================================= + +TopoDS_Vertex BRepTools_ReShape::CopyVertex(const TopoDS_Vertex& theV, + const gp_Pnt& theNewPos, + const Standard_Real theTol) +{ + TopoDS_Vertex aVertexCopy; + Standard_Boolean isRecorded = IsRecorded(theV); + aVertexCopy = isRecorded ? TopoDS::Vertex(Apply(theV)) : TopoDS::Vertex(theV.EmptyCopied()); + + BRep_Builder B; + Standard_Real aNewTol = theTol > 0.0 ? theTol : BRep_Tool::Tolerance(theV); + B.UpdateVertex(aVertexCopy, theNewPos, aNewTol); + + if (!isRecorded) + Replace(theV, aVertexCopy); + + return aVertexCopy; +} diff --git a/src/BRepTools/BRepTools_ReShape.hxx b/src/BRepTools/BRepTools_ReShape.hxx index c9e39837e9..b176fd7e8b 100644 --- a/src/BRepTools/BRepTools_ReShape.hxx +++ b/src/BRepTools/BRepTools_ReShape.hxx @@ -26,6 +26,7 @@ #include #include class TopoDS_Shape; +class TopoDS_Vertex; class BRepTools_ReShape; @@ -123,7 +124,19 @@ public: //! during replacing shapes. Standard_EXPORT virtual Standard_Boolean& ModeConsiderOrientation(); + //! Returns modified copy of vertex if original one is not recorded or returns modified original vertex otherwise. + //@param theV - original vertex. + //@param theTol - new tolerance of vertex, optional. + Standard_EXPORT TopoDS_Vertex CopyVertex(const TopoDS_Vertex& theV, + const Standard_Real theTol = -1.0); + //! Returns modified copy of vertex if original one is not recorded or returns modified original vertex otherwise. + //@param theV - original vertex. + //@param theNewPos - new position for vertex copy. + //@param theTol - new tolerance of vertex. + Standard_EXPORT TopoDS_Vertex CopyVertex(const TopoDS_Vertex& theV, + const gp_Pnt& theNewPos, + const Standard_Real aTol); DEFINE_STANDARD_RTTI(BRepTools_ReShape,MMgt_TShared) diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx index 4f228714f7..55f80718c2 100644 --- a/src/ShapeFix/ShapeFix_Edge.cxx +++ b/src/ShapeFix/ShapeFix_Edge.cxx @@ -59,6 +59,7 @@ #include #include #include +#include //======================================================================= //function : ShapeFix_Edge @@ -575,22 +576,36 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge, //purpose : //======================================================================= -Standard_Boolean ShapeFix_Edge::FixVertexTolerance(const TopoDS_Edge& edge, + Standard_Boolean ShapeFix_Edge::FixVertexTolerance(const TopoDS_Edge& edge, const TopoDS_Face& face) { myStatus = ShapeExtend::EncodeStatus ( ShapeExtend_OK ); + TopoDS_Edge anEdgeCopy = edge; ShapeAnalysis_Edge sae; + if (!Context().IsNull()) + { + anEdgeCopy = TopoDS::Edge(Context()->Apply(edge)); + } + Standard_Real toler1, toler2; - if (!sae.CheckVertexTolerance (edge, face, toler1, toler2)) return Standard_False; + if (!sae.CheckVertexTolerance (anEdgeCopy, face, toler1, toler2)) return Standard_False; if (sae.Status (ShapeExtend_DONE1)) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1); if (sae.Status (ShapeExtend_DONE2)) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); BRep_Builder B; - TopoDS_Vertex V1 = sae.FirstVertex(edge); - TopoDS_Vertex V2 = sae.LastVertex(edge); - B.UpdateVertex (V1, toler1); - B.UpdateVertex (V2, toler2); + TopoDS_Vertex V1 = sae.FirstVertex(anEdgeCopy); + TopoDS_Vertex V2 = sae.LastVertex(anEdgeCopy); + if (! Context().IsNull()) + { + Context()->CopyVertex(V1,toler1); + Context()->CopyVertex(V2,toler2); + } + else + { + B.UpdateVertex (V1, toler1); + B.UpdateVertex (V2, toler2); + } return Standard_True; } @@ -602,18 +617,31 @@ Standard_Boolean ShapeFix_Edge::FixVertexTolerance(const TopoDS_Edge& edge, Standard_Boolean ShapeFix_Edge::FixVertexTolerance(const TopoDS_Edge& edge) { myStatus = ShapeExtend::EncodeStatus ( ShapeExtend_OK ); + TopoDS_Edge anEdgeCopy = edge; ShapeAnalysis_Edge sae; + if (!Context().IsNull()) + { + anEdgeCopy = TopoDS::Edge(Context()->Apply(edge)); + } Standard_Real toler1, toler2; - if (!sae.CheckVertexTolerance (edge, toler1, toler2)) return Standard_False; + if (!sae.CheckVertexTolerance (anEdgeCopy, toler1, toler2)) return Standard_False; if (sae.Status (ShapeExtend_DONE1)) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1); if (sae.Status (ShapeExtend_DONE2)) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); BRep_Builder B; - TopoDS_Vertex V1 = sae.FirstVertex(edge); - TopoDS_Vertex V2 = sae.LastVertex(edge); - B.UpdateVertex (V1, toler1); - B.UpdateVertex (V2, toler2); + TopoDS_Vertex V1 = sae.FirstVertex(anEdgeCopy); + TopoDS_Vertex V2 = sae.LastVertex(anEdgeCopy); + if (! Context().IsNull()) + { + Context()->CopyVertex(V1,toler1); + Context()->CopyVertex(V2,toler2); + } + else + { + B.UpdateVertex (V1, toler1); + B.UpdateVertex (V2, toler2); + } return Standard_True; } @@ -678,17 +706,19 @@ Standard_Boolean ShapeFix_Edge::FixReversed2d (const TopoDS_Edge& edge, //======================================================================= Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, - const Standard_Real tolerance) + const Standard_Real tolerance) { myStatus = ShapeExtend::EncodeStatus ( ShapeExtend_OK ); - - if ( BRep_Tool::Degenerated ( edge ) ) { + + if ( BRep_Tool::Degenerated ( edge ) ) + { BRep_Builder B; if ( ! BRep_Tool::SameRange (edge) ) TempSameRange ( edge, Precision::PConfusion() ); B.SameParameter ( edge, Standard_True ); return Standard_False; } + ShapeFix_ShapeTolerance SFST; ShapeAnalysis_Edge sae; BRep_Builder B; @@ -699,18 +729,20 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, Standard_Real TolFV = ( V1.IsNull() ? 0. : BRep_Tool::Tolerance ( V1 ) ); Standard_Real TolLV = ( V2.IsNull() ? 0. : BRep_Tool::Tolerance ( V2 ) ); Standard_Real tol = BRep_Tool::Tolerance (edge); - + Standard_Boolean wasSP = BRep_Tool::SameParameter ( edge ), SP = Standard_False; { - try { + try + { OCC_CATCH_SIGNALS - if ( ! BRep_Tool::SameRange (edge) ) - TempSameRange ( edge, Precision::PConfusion() ); + if ( ! BRep_Tool::SameRange (edge) ) + TempSameRange ( edge, Precision::PConfusion() ); //#81 rln 15.03.99 S4135: for not SP edge choose the best result (either BRepLib or deviation only) - if ( ! wasSP ) { - //create copyedge as copy of edge with the same vertices and copy of pcurves on the same surface(s) - copyedge = ShapeBuild_Edge().Copy ( edge, Standard_False ); - B.SameParameter ( copyedge, Standard_False ); + if ( ! wasSP ) + { + //create copyedge as copy of edge with the same vertices and copy of pcurves on the same surface(s) + copyedge = ShapeBuild_Edge().Copy ( edge, Standard_False ); + B.SameParameter ( copyedge, Standard_False ); // ShapeBuild_Edge::Copy() may change 3D curve range (if it's outside of its period). // In this case pcurves in BRepLib::SameParameter() will be changed as well // and later ShapeBuild_Edge::CopyPCurves() will copy pcurves keeping original range. @@ -718,13 +750,13 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, Standard_Real aF, aL; BRep_Tool::Range (edge, aF, aL); B.Range (copyedge, aF, aL, Standard_True); // only 3D - BRepLib::SameParameter ( copyedge, ( tolerance >= Precision::Confusion() ? - tolerance : tol ) ); - SP = BRep_Tool::SameParameter ( copyedge ); - if ( ! SP ) myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); + BRepLib::SameParameter ( copyedge, ( tolerance >= Precision::Confusion() ? tolerance : tol ) ); + SP = BRep_Tool::SameParameter ( copyedge ); + if ( ! SP ) myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); } } - catch(Standard_Failure) { + catch(Standard_Failure) + { #ifdef OCCT_DEBUG cout << "\nWarning: ShapeFix_Edge: Exception in SameParameter: "; Standard_Failure::Caught()->Print(cout); cout << endl; @@ -732,25 +764,27 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); } } - + // compute deviation on the original pcurves Standard_Real maxdev; B.SameParameter ( edge, Standard_True ); sae.CheckSameParameter ( edge, maxdev ); if ( sae.Status ( ShapeExtend_FAIL2 ) ) myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL1 ); - + // if BRepLib was OK, compare and select the best variant - if ( SP ) { + if ( SP ) + { Standard_Real BRLTol = BRep_Tool::Tolerance ( copyedge ), BRLDev; sae.CheckSameParameter ( copyedge, BRLDev ); myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE3 ); if ( BRLTol < BRLDev ) BRLTol = BRLDev; - + //chose the best result - if ( BRLTol < maxdev ) { + if ( BRLTol < maxdev ) + { if ( sae.Status ( ShapeExtend_FAIL2 ) ) - myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL1 ); + myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL1 ); //copy pcurves and tolerances from copyedge ShapeBuild_Edge().CopyPCurves ( edge, copyedge ); maxdev = BRLTol; @@ -758,11 +792,13 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE5 ); } } + //restore tolerances because they could be modified by BRepLib if ( ! V1.IsNull() ) SFST.SetTolerance ( V1, Max (maxdev, TolFV), TopAbs_VERTEX); if ( ! V2.IsNull() ) SFST.SetTolerance ( V2, Max (maxdev, TolLV), TopAbs_VERTEX); - - if ( maxdev > tol ) { + + if ( maxdev > tol ) + { myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 ); B.UpdateEdge ( edge, maxdev ); FixVertexTolerance(edge); @@ -781,3 +817,23 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, { return ShapeExtend::DecodeStatus (myStatus, status); } + +//======================================================================= +//function : Context +//purpose : +//======================================================================= + +inline Handle(ShapeBuild_ReShape) ShapeFix_Edge::Context() const +{ + return myContext; +} + +//======================================================================= +//function : SetContext +//purpose : +//======================================================================= + +void ShapeFix_Edge::SetContext (const Handle(ShapeBuild_ReShape)& context) +{ + myContext = context; +} diff --git a/src/ShapeFix/ShapeFix_Edge.hxx b/src/ShapeFix/ShapeFix_Edge.hxx index fa70a1671f..d5c052aa18 100644 --- a/src/ShapeFix/ShapeFix_Edge.hxx +++ b/src/ShapeFix/ShapeFix_Edge.hxx @@ -31,7 +31,7 @@ class TopoDS_Face; class Geom_Surface; class TopLoc_Location; class ShapeAnalysis_Surface; - +class ShapeBuild_ReShape; class ShapeFix_Edge; DEFINE_STANDARD_HANDLE(ShapeFix_Edge, MMgt_TShared) @@ -177,14 +177,17 @@ public: //! Returns the status (in the form of True/False) of last Fix Standard_EXPORT Standard_Boolean Status (const ShapeExtend_Status status) const; + //! Sets context + Standard_EXPORT void SetContext (const Handle(ShapeBuild_ReShape)& context); - + //! Returns context + Handle(ShapeBuild_ReShape) Context() const; DEFINE_STANDARD_RTTI(ShapeFix_Edge,MMgt_TShared) protected: - + Handle(ShapeBuild_ReShape) myContext; Standard_Integer myStatus; Handle(ShapeConstruct_ProjectCurveOnSurface) myProjector; diff --git a/src/ShapeFix/ShapeFix_IntersectionTool.cxx b/src/ShapeFix/ShapeFix_IntersectionTool.cxx index 2e5f70f9ee..03cb0ceffc 100644 --- a/src/ShapeFix/ShapeFix_IntersectionTool.cxx +++ b/src/ShapeFix/ShapeFix_IntersectionTool.cxx @@ -837,7 +837,7 @@ Standard_Boolean ShapeFix_IntersectionTool::FixSelfIntersectWire //Standard_Real area2d = ShapeAnalysis::TotCross2D(sewd,face); //if(area2dApply(face); Standard_Real MaxTolVert=0.0; for(TopExp_Explorer exp(SF,TopAbs_VERTEX); exp.More(); exp.Next()) { Standard_Real tolV = BRep_Tool::Tolerance(TopoDS::Vertex(exp.Current())); diff --git a/src/ShapeFix/ShapeFix_Shape.cxx b/src/ShapeFix/ShapeFix_Shape.cxx index f1cbab9dc5..459bc81e9f 100644 --- a/src/ShapeFix/ShapeFix_Shape.cxx +++ b/src/ShapeFix/ShapeFix_Shape.cxx @@ -227,6 +227,7 @@ Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator) } case TopAbs_EDGE: { Handle(ShapeFix_Edge) sfe = FixEdgeTool(); + sfe->SetContext(Context()); if(sfe->FixVertexTolerance(TopoDS::Edge(S))) myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 ); break; @@ -238,9 +239,8 @@ Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator) // Switch to the second progress indication scope if it exists aPSentry.Next(); - - myResult = Context()->Apply(S); + myResult = Context()->Apply(S); if ( NeedFix(myFixSameParameterMode) ) { SameParameter(myResult, Standard_False, theProgress); @@ -262,9 +262,9 @@ Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator) TopExp_Explorer anExpE (myResult, TopAbs_EDGE); for ( ; anExpE.More(); anExpE.Next()) sfe->FixVertexTolerance( TopoDS::Edge (anExpE.Current())); - } } + myResult = Context()->Apply(myResult); if ( !fft.IsNull() ) fft->FixSmallAreaWireMode() = savFixSmallAreaWireMode; diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx index d161e60b45..af37d9085e 100644 --- a/src/ShapeFix/ShapeFix_Wire.cxx +++ b/src/ShapeFix/ShapeFix_Wire.cxx @@ -337,7 +337,9 @@ Standard_Boolean ShapeFix_Wire::Perform() { ClearStatuses(); if ( ! IsLoaded() ) return Standard_False; - + + if ( !Context().IsNull() ) + myFixEdge->SetContext( Context() ); Standard_Integer Fixed = Standard_False; @@ -415,7 +417,12 @@ Standard_Boolean ShapeFix_Wire::Perform() Handle(ShapeExtend_WireData) sbwd = WireData(); for (Standard_Integer iedge = 1; iedge <= sbwd->NbEdges(); iedge++) if ( myFixEdge->FixVertexTolerance (sbwd->Edge (iedge)) ) + { Fixed = Standard_True; + } + + if ( !Context().IsNull() ) + UpdateWire(); return Fixed; } @@ -776,7 +783,7 @@ Standard_Boolean ShapeFix_Wire::FixEdgeCurves() } // fix same parameter - if ( isReady && NeedFix ( myFixSameParameterMode ) ) { + if ( isReady && NeedFix ( myFixSameParameterMode ) ){ for ( i=1; i <= nb; i++ ) { // skl 28.10.2004 for OCC6366 - check SameRange ShapeAnalysis_Edge sae; @@ -800,19 +807,24 @@ Standard_Boolean ShapeFix_Wire::FixEdgeCurves() myStatusEdgeCurves |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL8 ); } } - + //:abv 10.06.02: porting C40 -> dev (CC670-12608.stp): moved from Perform() // Update with face is needed for plane surfaces (w/o stored pcurves) - if ( NeedFix ( myFixVertexToleranceMode ) ) { - for ( i=1; i <= nb; i++) { + if ( NeedFix ( myFixVertexToleranceMode ) ) + { + for ( i=1; i <= nb; i++) + { myFixEdge->FixVertexTolerance (sbwd->Edge (i), face); if ( myFixEdge->Status ( ShapeExtend_DONE ) ) - myStatusEdgeCurves |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE8 ); + myStatusEdgeCurves |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE8 ); if ( myFixEdge->Status ( ShapeExtend_FAIL ) ) - myStatusEdgeCurves |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL8 ); + myStatusEdgeCurves |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL8 ); } + if (!Context().IsNull() ) + UpdateWire(); } + return StatusEdgeCurves ( ShapeExtend_DONE ); } @@ -934,7 +946,7 @@ Standard_Boolean ShapeFix_Wire::FixSelfIntersection() } } } - + //pdn 17.03.99 S4135 to avoid regression fixing not adjacent intersection if ( NeedFix ( myFixNonAdjacentIntersectingEdgesMode ) ) { @@ -2386,7 +2398,7 @@ Standard_Boolean ShapeFix_Wire::FixIntersectingEdges (const Standard_Integer num Standard_Real a1, b1, a2, b2; BRep_Tool::Range ( E1, Face(), a1, b1 ); BRep_Tool::Range ( E2, Face(), a2, b2 ); - + ShapeAnalysis_Edge sae; TopoDS_Vertex Vp = sae.FirstVertex ( E1 ); TopoDS_Vertex V1 = sae.LastVertex ( E1 ); @@ -2401,7 +2413,7 @@ Standard_Boolean ShapeFix_Wire::FixIntersectingEdges (const Standard_Integer num Standard_Boolean IsCutLine = Standard_False; BRep_Builder B; - + Standard_Integer nb = points3d.Length(); for ( Standard_Integer i=1; i <= nb; i++ ) { const IntRes2d_IntersectionPoint &IP = points2d.Value(i); @@ -2422,18 +2434,58 @@ Standard_Boolean ShapeFix_Wire::FixIntersectingEdges (const Standard_Integer num Standard_Boolean locMayEdit = myTopoMode; // Always try to modify the tolerance firstly as a better solution - if ( /*! myTopoMode &&*/ newtol > tol ) { + if ( /*! myTopoMode &&*/ newtol > tol ) + { Standard_Real te1 = rad + ComputeLocalDeviation (E1, pint, pnt, param1, ( isForward1 ? b1 : a1 ), Face() ); Standard_Real te2 = rad + ComputeLocalDeviation (E2, pint, pnt, ( isForward2 ? a2 : b2 ), param2, Face() ); Standard_Real maxte = Max ( te1, te2 ); - if ( maxte < MaxTolerance() && maxte < newtol ) { - if ( BRep_Tool::Tolerance(E1) < te1 || BRep_Tool::Tolerance(E2) < te2 ) { + if ( maxte < MaxTolerance() && maxte < newtol ) + { + if ( BRep_Tool::Tolerance(E1) < te1 || BRep_Tool::Tolerance(E2) < te2 ) + { #ifdef OCCT_DEBUG cout << "Warning: ShapeFix_Wire::FixIE: edges tolerance increased: (" << te1 << ", " << te2 << ") / " << newtol << endl; #endif + + // Make copy of edges. + if (!Context().IsNull()) + { + // Intersection point of two base edges. + ShapeBuild_Edge aSBE; + TopoDS_Vertex VV1 = Context()->CopyVertex(V1); + + TopoDS_Vertex VVp = Vp; + TopoDS_Vertex VVn = Vn; + if (Vp.IsSame(Vn)) + { + // Should modify only one vertex. + VVp = Context()->CopyVertex(Vp); + VVn = VVp; + } + else + { + VVp = Context()->CopyVertex(Vp); + VVn = Context()->CopyVertex(Vn); + } + + TopoDS_Edge EE1 = aSBE.CopyReplaceVertices(E1, VVp, VV1); + TopoDS_Edge EE2 = aSBE.CopyReplaceVertices(E2, VV1, VVn); + + Context()->Replace(E1, EE1); + Context()->Replace(E2, EE2); + + UpdateWire(); + E1 = sbwd->Edge(n1); + E2 = sbwd->Edge(n2); + Vp = sae.FirstVertex ( E1 ); + V1 = sae.LastVertex ( E1 ); + V2 = sae.FirstVertex ( E2 ); + Vn = sae.LastVertex ( E2 ); + } + B.UpdateEdge ( E1, 1.000001 * te1 ); B.UpdateVertex ( sae.FirstVertex ( E1 ), 1.000001 * te1 ); B.UpdateVertex ( sae.LastVertex ( E1 ), 1.000001 * te1 ); diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx index 92a7719013..74128f5392 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx @@ -1079,7 +1079,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces() TopExp_Explorer exps; for (exps.Init(myShape, TopAbs_SHELL); exps.More(); exps.Next()) { TopoDS_Shell aShell = TopoDS::Shell(exps.Current()); - + // map of processed shapes TopTools_MapOfShape aProcessed; @@ -1357,11 +1357,11 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces() } else { - Handle(ShapeExtend_WireData) sbwd = + Handle(ShapeExtend_WireData) sbwd = new ShapeExtend_WireData (aWire); - ShapeFix_WireSegment seg ( sbwd, TopAbs_REVERSED ); - wires.Append(seg); - } + ShapeFix_WireSegment seg ( sbwd, TopAbs_REVERSED ); + wires.Append(seg); + } } CompShell.DispatchWires ( parts,wires ); @@ -1415,6 +1415,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces() TopoDS_Shape aResult = myContext->Apply(aShell); ShapeFix_Edge sfe; + if (!myContext.IsNull()) sfe.SetContext(myContext); for (exp.Init(aResult,TopAbs_EDGE); exp.More(); exp.Next()) { TopoDS_Edge E = TopoDS::Edge(exp.Current()); sfe.FixVertexTolerance (E); diff --git a/tests/bugs/heal/bug26656 b/tests/bugs/heal/bug26656 new file mode 100644 index 0000000000..714dcd891f --- /dev/null +++ b/tests/bugs/heal/bug26656 @@ -0,0 +1,27 @@ +puts "========" +puts "OCC26656" +puts "========" +puts "" +####################################################################### +# ShapeFix_Face introduces extremely high vertex tolerance in the input shape +####################################################################### + +restore [locate_data_file bug26656_unify.input.brep] i + +puts "\nBefore ShapeFix_Face" +regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance i] full MaxTolerance_1 + +set expected_MaxTolerance 2.0024548532087701e-07 +set tol_abs_MaxTolerance 5.0e-7 +set tol_rel_MaxTolerance 0.1 + +puts "MaxTolerance_1 = $MaxTolerance_1" +checkreal "MaxTolerance" ${MaxTolerance_1} ${expected_MaxTolerance} ${tol_abs_MaxTolerance} ${tol_rel_MaxTolerance} + +unifysamedom r i + +puts "\nAfter ShapeFix_Face" +regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance i] full MaxTolerance_2 + +puts "MaxTolerance_2 = $MaxTolerance_2" +checkreal "MaxTolerance" ${MaxTolerance_2} ${expected_MaxTolerance} ${tol_abs_MaxTolerance} ${tol_rel_MaxTolerance} diff --git a/tests/de/iges_1/G7 b/tests/de/iges_1/G7 index dcadd42b9f..86585ac819 100755 --- a/tests/de/iges_1/G7 +++ b/tests/de/iges_1/G7 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 410 ( 410 ) Summary = 11585 ( 11585 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 410 ( 410 ) FreeWire = 410 ( 410 ) FreeEdge = 2910 ( 2910 ) SharedEdge = 4569 ( 4569 ) TOLERANCE : MaxTol = 0.6309534605 ( 0.6309534603 ) AvgTol = 0.01007170672 ( 0.0100718085 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 1651 ( 2074 ) N2Labels = 0 ( 0 ) TotalLabels = 1652 ( 2075 ) NameLabels = 1652 ( 2053 ) ColorLabels = 1651 ( 2074 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 1651 ( 2052 ) N2Labels = 0 ( 0 ) TotalLabels = 1652 ( 2053 ) NameLabels = 1652 ( 2053 ) ColorLabels = 1651 ( 2052 ) 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/H6 b/tests/de/iges_1/H6 index 81c81c3df7..9f8e8ac375 100644 --- a/tests/de/iges_1/H6 +++ b/tests/de/iges_1/H6 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) Summary = 7973 ( 8005 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) FreeWire = 0 ( 32 ) FreeEdge = 70 ( 70 ) SharedEdge = 3748 ( 3748 ) TOLERANCE : MaxTol = 0.9049033554 ( 0.9049033554 ) AvgTol = 0.01221723065 ( 0.01221855991 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 246 ( 2188 ) N2Labels = 0 ( 0 ) TotalLabels = 247 ( 2189 ) NameLabels = 247 ( 374 ) ColorLabels = 246 ( 2188 ) LayerLabels = 241 ( 2183 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 246 ( 2183 ) N2Labels = 0 ( 0 ) TotalLabels = 247 ( 2184 ) NameLabels = 247 ( 374 ) ColorLabels = 246 ( 2183 ) LayerLabels = 241 ( 2178 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) COLORS : Colors = CYAN1 GREEN RED WHITE YELLOW ( CYAN1 GREEN RED WHITE YELLOW ) diff --git a/tests/de/iges_1/H8 b/tests/de/iges_1/H8 index 14efd6a975..0fdaab0fbf 100644 --- a/tests/de/iges_1/H8 +++ b/tests/de/iges_1/H8 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) Summary = 7763 ( 7763 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) FreeWire = 0 ( 0 ) FreeEdge = 6 ( 6 ) SharedEdge = 3665 ( 3665 ) TOLERANCE : MaxTol = 0.1393674657 ( 0.1393674657 ) AvgTol = 0.003094049943 ( 0.003079317701 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 3661 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 3662 ) NameLabels = 215 ( 330 ) ColorLabels = 214 ( 3661 ) LayerLabels = 209 ( 3656 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 2533 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 2534 ) NameLabels = 215 ( 330 ) ColorLabels = 214 ( 2533 ) LayerLabels = 209 ( 2528 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) COLORS : Colors = CYAN1 GREEN RED WHITE YELLOW ( CYAN1 GREEN RED WHITE YELLOW ) diff --git a/tests/de/iges_1/I1 b/tests/de/iges_1/I1 index 34de43ddc2..c9e012e535 100644 --- a/tests/de/iges_1/I1 +++ b/tests/de/iges_1/I1 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 218 ( 218 ) Summary = 33194 ( 33225 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 218 ( 218 ) FreeWire = 77 ( 108 ) FreeEdge = 2656 ( 2656 ) SharedEdge = 15767 ( 15767 ) TOLERANCE : MaxTol = 0.1504135906 ( 0.1504135906 ) AvgTol = 0.0004235230987 ( 0.0004477161756 ) -LABELS : N0Labels = 2 ( 2 ) N1Labels = 1279 ( 3464 ) N2Labels = 0 ( 0 ) TotalLabels = 1281 ( 3466 ) NameLabels = 1281 ( 1491 ) ColorLabels = 1280 ( 3465 ) LayerLabels = 284 ( 2412 ) +LABELS : N0Labels = 2 ( 2 ) N1Labels = 1279 ( 2954 ) N2Labels = 0 ( 0 ) TotalLabels = 1281 ( 2956 ) NameLabels = 1281 ( 1491 ) ColorLabels = 1280 ( 2955 ) LayerLabels = 284 ( 1902 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = GREEN MAGENTA1 WHITE YELLOW ( GREEN MAGENTA1 WHITE YELLOW ) diff --git a/tests/de/iges_1/J2 b/tests/de/iges_1/J2 index c62d702fef..72eb2b6948 100644 --- a/tests/de/iges_1/J2 +++ b/tests/de/iges_1/J2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 900 ( 900 ) Summary = 18221 ( 18221 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 900 ( 900 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 8213 ( 8213 ) TOLERANCE : MaxTol = 0.004034169186 ( 0.004034577888 ) AvgTol = 7.709492698e-006 ( 1.210857047e-005 ) -LABELS : N0Labels = 900 ( 900 ) N1Labels = 0 ( 930 ) N2Labels = 0 ( 0 ) TotalLabels = 900 ( 1830 ) NameLabels = 900 ( 900 ) ColorLabels = 900 ( 1830 ) LayerLabels = 900 ( 1830 ) +LABELS : N0Labels = 900 ( 900 ) N1Labels = 0 ( 877 ) N2Labels = 0 ( 0 ) TotalLabels = 900 ( 1777 ) NameLabels = 900 ( 900 ) ColorLabels = 900 ( 1777 ) LayerLabels = 900 ( 1777 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = YELLOW ( YELLOW ) diff --git a/tests/de/iges_1/J3 b/tests/de/iges_1/J3 index 1fecba166b..8928397d3a 100644 --- a/tests/de/iges_1/J3 +++ b/tests/de/iges_1/J3 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1038 ( 1038 ) Summary = 22098 ( 22096 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1038 ( 1038 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 10005 ( 10004 ) TOLERANCE : MaxTol = 0.5433123154 ( 0.5433122968 ) AvgTol = 0.002230678782 ( 0.002235663837 ) -LABELS : N0Labels = 1038 ( 1038 ) N1Labels = 0 ( 1449 ) N2Labels = 0 ( 0 ) TotalLabels = 1038 ( 2487 ) NameLabels = 1038 ( 1038 ) ColorLabels = 1038 ( 2487 ) LayerLabels = 1038 ( 2487 ) +LABELS : N0Labels = 1038 ( 1038 ) N1Labels = 0 ( 1109 ) N2Labels = 0 ( 0 ) TotalLabels = 1038 ( 2147 ) NameLabels = 1038 ( 1038 ) ColorLabels = 1038 ( 2147 ) LayerLabels = 1038 ( 2147 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = GREEN RED ( GREEN RED ) diff --git a/tests/de/iges_1/J8 b/tests/de/iges_1/J8 index bbc77fe109..3cd1dadc20 100644 --- a/tests/de/iges_1/J8 +++ b/tests/de/iges_1/J8 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 308 ( 308 ) Summary = 6755 ( 6756 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 308 ( 308 ) FreeWire = 6 ( 7 ) FreeEdge = 795 ( 795 ) SharedEdge = 2675 ( 2675 ) TOLERANCE : MaxTol = 0.9778021574 ( 0.9778021574 ) AvgTol = 0.03580274709 ( 0.03579740035 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 1089 ( 2054 ) N2Labels = 0 ( 0 ) TotalLabels = 1090 ( 2055 ) NameLabels = 1090 ( 1285 ) ColorLabels = 1089 ( 2054 ) LayerLabels = 168 ( 311 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 1089 ( 2047 ) N2Labels = 0 ( 0 ) TotalLabels = 1090 ( 2048 ) NameLabels = 1090 ( 1285 ) ColorLabels = 1089 ( 2047 ) LayerLabels = 168 ( 311 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_1/K2 b/tests/de/iges_1/K2 index 9e9e5d92bc..9d8b477729 100644 --- a/tests/de/iges_1/K2 +++ b/tests/de/iges_1/K2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 568 ( 568 ) Summary = 8540 ( 8540 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 568 ( 568 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3701 ( 3701 ) TOLERANCE : MaxTol = 0.4977710304 ( 0.4977710286 ) AvgTol = 0.001985067479 ( 0.001988149118 ) -LABELS : N0Labels = 568 ( 569 ) N1Labels = 0 ( 1207 ) N2Labels = 0 ( 0 ) TotalLabels = 568 ( 1776 ) NameLabels = 568 ( 569 ) ColorLabels = 568 ( 1775 ) LayerLabels = 568 ( 1775 ) +LABELS : N0Labels = 568 ( 569 ) N1Labels = 0 ( 878 ) N2Labels = 0 ( 0 ) TotalLabels = 568 ( 1447 ) NameLabels = 568 ( 569 ) ColorLabels = 568 ( 1446 ) LayerLabels = 568 ( 1446 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = YELLOW ( YELLOW ) diff --git a/tests/de/iges_1/K3 b/tests/de/iges_1/K3 index 632d6a715b..ca42b0e947 100644 --- a/tests/de/iges_1/K3 +++ b/tests/de/iges_1/K3 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 12 ( 20 ) Faces = 16 ( 18 ) Shells = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) Summary = 68422 ( 68420 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) FreeWire = 10 ( 10 ) FreeEdge = 283 ( 283 ) SharedEdge = 29075 ( 29079 ) TOLERANCE : MaxTol = 0.9874083984 ( 0.9875071265 ) AvgTol = 0.01114309412 ( 0.01115568387 ) -LABELS : N0Labels = 5392 ( 5458 ) N1Labels = 18 ( 4427 ) N2Labels = 0 ( 0 ) TotalLabels = 5410 ( 9885 ) NameLabels = 5392 ( 5458 ) ColorLabels = 5391 ( 9819 ) LayerLabels = 5391 ( 9819 ) +LABELS : N0Labels = 5392 ( 5458 ) N1Labels = 18 ( 4297 ) N2Labels = 0 ( 0 ) TotalLabels = 5410 ( 9755 ) NameLabels = 5392 ( 5458 ) ColorLabels = 5391 ( 9689 ) LayerLabels = 5391 ( 9689 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = BLACK BLUE1 CYAN1 GREEN ( BLACK BLUE1 CYAN1 GREEN ) diff --git a/tests/de/iges_1/K9 b/tests/de/iges_1/K9 index 2c667f0de6..1da0cd8cc6 100644 --- a/tests/de/iges_1/K9 +++ b/tests/de/iges_1/K9 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 392 ( 392 ) Summary = 10882 ( 10908 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 392 ( 392 ) FreeWire = 97 ( 121 ) FreeEdge = 1546 ( 1546 ) SharedEdge = 4308 ( 4310 ) TOLERANCE : MaxTol = 0.9393822539 ( 0.9393822539 ) AvgTol = 0.01258756217 ( 0.0125611438 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 1695 ( 3509 ) N2Labels = 0 ( 0 ) TotalLabels = 1696 ( 3510 ) NameLabels = 1696 ( 1972 ) ColorLabels = 1695 ( 3509 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 1695 ( 3503 ) N2Labels = 0 ( 0 ) TotalLabels = 1696 ( 3504 ) NameLabels = 1696 ( 1972 ) ColorLabels = 1695 ( 3503 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = BLUE1 GREEN WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) diff --git a/tests/de/iges_1/L2 b/tests/de/iges_1/L2 index e150f65019..df034cb7f1 100644 --- a/tests/de/iges_1/L2 +++ b/tests/de/iges_1/L2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1041 ( 1041 ) Summary = 15066 ( 15066 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1041 ( 1041 ) FreeWire = 90 ( 90 ) FreeEdge = 701 ( 701 ) SharedEdge = 6184 ( 6184 ) TOLERANCE : MaxTol = 0.90877121 ( 0.9087712052 ) AvgTol = 0.01331864791 ( 0.01331886464 ) -LABELS : N0Labels = 1571 ( 1571 ) N1Labels = 0 ( 615 ) N2Labels = 0 ( 0 ) TotalLabels = 1571 ( 2186 ) NameLabels = 1571 ( 2173 ) ColorLabels = 1481 ( 2186 ) LayerLabels = 1481 ( 2186 ) +LABELS : N0Labels = 1571 ( 1571 ) N1Labels = 0 ( 612 ) N2Labels = 0 ( 0 ) TotalLabels = 1571 ( 2183 ) NameLabels = 1571 ( 2173 ) ColorLabels = 1481 ( 2183 ) LayerLabels = 1481 ( 2183 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = GREEN MAGENTA1 RED YELLOW ( GREEN MAGENTA1 RED YELLOW ) diff --git a/tests/de/iges_1/L5 b/tests/de/iges_1/L5 index b53eda8875..1d479b21cd 100644 --- a/tests/de/iges_1/L5 +++ b/tests/de/iges_1/L5 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 221 ( 221 ) Summary = 13351 ( 13351 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 221 ( 221 ) FreeWire = 0 ( 0 ) FreeEdge = 6 ( 6 ) SharedEdge = 6452 ( 6452 ) TOLERANCE : MaxTol = 0.01225213609 ( 0.01098786532 ) AvgTol = 0.0001816430452 ( 0.0001806163302 ) -LABELS : N0Labels = 232 ( 232 ) N1Labels = 0 ( 6521 ) N2Labels = 0 ( 0 ) TotalLabels = 232 ( 6753 ) NameLabels = 232 ( 347 ) ColorLabels = 227 ( 6753 ) LayerLabels = 227 ( 6753 ) +LABELS : N0Labels = 232 ( 232 ) N1Labels = 0 ( 6150 ) N2Labels = 0 ( 0 ) TotalLabels = 232 ( 6382 ) NameLabels = 232 ( 347 ) ColorLabels = 227 ( 6382 ) LayerLabels = 227 ( 6382 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = RED ( RED ) diff --git a/tests/de/iges_1/L6 b/tests/de/iges_1/L6 index e5b1cb998e..989c94fe25 100644 --- a/tests/de/iges_1/L6 +++ b/tests/de/iges_1/L6 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 186 ( 186 ) Summary = 10670 ( 10670 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 186 ( 186 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 5148 ( 5148 ) TOLERANCE : MaxTol = 0.04931043567 ( 0.04931014771 ) AvgTol = 0.000378470309 ( 0.0003854574649 ) -LABELS : N0Labels = 186 ( 186 ) N1Labels = 0 ( 569 ) N2Labels = 0 ( 0 ) TotalLabels = 186 ( 755 ) NameLabels = 186 ( 186 ) ColorLabels = 186 ( 755 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 186 ( 186 ) N1Labels = 0 ( 201 ) N2Labels = 0 ( 0 ) TotalLabels = 186 ( 387 ) NameLabels = 186 ( 186 ) ColorLabels = 186 ( 387 ) 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/M2 b/tests/de/iges_1/M2 index 26bfc8696a..1cce42a55e 100644 --- a/tests/de/iges_1/M2 +++ b/tests/de/iges_1/M2 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 215 ( 215 ) Summary = 3771 ( 3779 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 215 ( 215 ) FreeWire = 0 ( 4 ) FreeEdge = 8 ( 8 ) SharedEdge = 1666 ( 1670 ) TOLERANCE : MaxTol = 0.6931734571 ( 0.6931734576 ) AvgTol = 0.009873021128 ( 0.009847667242 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 223 ( 1190 ) N2Labels = 0 ( 0 ) TotalLabels = 224 ( 1191 ) NameLabels = 224 ( 332 ) ColorLabels = 223 ( 1190 ) LayerLabels = 223 ( 1190 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 223 ( 1186 ) N2Labels = 0 ( 0 ) TotalLabels = 224 ( 1187 ) NameLabels = 224 ( 332 ) ColorLabels = 223 ( 1186 ) LayerLabels = 223 ( 1186 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = GREEN WHITE ( GREEN WHITE ) diff --git a/tests/de/iges_1/M3 b/tests/de/iges_1/M3 index 7dac165b0b..3c09e0dcfc 100644 --- a/tests/de/iges_1/M3 +++ b/tests/de/iges_1/M3 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 178 ( 178 ) Summary = 2133 ( 2133 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 178 ( 178 ) FreeWire = 0 ( 0 ) FreeEdge = 1 ( 1 ) SharedEdge = 895 ( 895 ) TOLERANCE : MaxTol = 0.4113920266 ( 0.4113920255 ) AvgTol = 0.004711547931 ( 0.004740618934 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 179 ( 553 ) N2Labels = 0 ( 0 ) TotalLabels = 180 ( 554 ) NameLabels = 180 ( 332 ) ColorLabels = 179 ( 553 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 179 ( 547 ) N2Labels = 0 ( 0 ) TotalLabels = 180 ( 548 ) NameLabels = 180 ( 332 ) ColorLabels = 179 ( 547 ) 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 index 832cbe69b5..623388e888 100755 --- a/tests/de/iges_1/M6 +++ b/tests/de/iges_1/M6 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So 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 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 534 ( 3844 ) N2Labels = 0 ( 0 ) TotalLabels = 535 ( 3845 ) NameLabels = 535 ( 833 ) ColorLabels = 534 ( 3844 ) LayerLabels = 532 ( 3842 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = BLUE1 WHITE ( BLUE1 WHITE ) diff --git a/tests/de/iges_1/M7 b/tests/de/iges_1/M7 index 8f92b92618..6cea1aedb3 100644 --- a/tests/de/iges_1/M7 +++ b/tests/de/iges_1/M7 @@ -10,7 +10,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1521 ( 1521 ) Summary = 20232 ( 20232 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1521 ( 1521 ) FreeWire = 20 ( 20 ) FreeEdge = 118 ( 118 ) SharedEdge = 8549 ( 8549 ) TOLERANCE : MaxTol = 0.9994545428 ( 0.9994545568 ) AvgTol = 0.05493298116 ( 0.05493334424 ) -LABELS : N0Labels = 1502 ( 1502 ) N1Labels = 60 ( 307 ) N2Labels = 0 ( 0 ) TotalLabels = 1562 ( 1809 ) NameLabels = 1562 ( 1580 ) ColorLabels = 1561 ( 1808 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1502 ( 1502 ) N1Labels = 60 ( 78 ) N2Labels = 0 ( 0 ) TotalLabels = 1562 ( 1580 ) NameLabels = 1562 ( 1580 ) ColorLabels = 1561 ( 1579 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = GOLD ( GOLD ) diff --git a/tests/de/iges_1/N3 b/tests/de/iges_1/N3 index 0b484fae63..21e59ee4ee 100644 --- a/tests/de/iges_1/N3 +++ b/tests/de/iges_1/N3 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 523 ( 523 ) Summary = 5936 ( 5926 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 523 ( 523 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2485 ( 2485 ) TOLERANCE : MaxTol = 0.1109937052 ( 0.111004803 ) AvgTol = 0.001890312889 ( 0.001893545105 ) -LABELS : N0Labels = 523 ( 523 ) N1Labels = 0 ( 591 ) N2Labels = 0 ( 0 ) TotalLabels = 523 ( 1114 ) NameLabels = 523 ( 641 ) ColorLabels = 523 ( 1114 ) LayerLabels = 523 ( 1114 ) +LABELS : N0Labels = 523 ( 523 ) N1Labels = 0 ( 441 ) N2Labels = 0 ( 0 ) TotalLabels = 523 ( 964 ) NameLabels = 523 ( 641 ) ColorLabels = 523 ( 964 ) LayerLabels = 523 ( 964 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = BLACK GREEN RED ( BLACK GREEN RED ) diff --git a/tests/de/iges_1/N5 b/tests/de/iges_1/N5 index c65a24ede0..69d6c5f1cd 100644 --- a/tests/de/iges_1/N5 +++ b/tests/de/iges_1/N5 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 1 ) Faces = 0 ( 1 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 240 ( 240 ) Summary = 7603 ( 7607 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 240 ( 240 ) FreeWire = 135 ( 139 ) FreeEdge = 1262 ( 1262 ) SharedEdge = 3013 ( 3013 ) TOLERANCE : MaxTol = 0.03614106862 ( 0.03613204275 ) AvgTol = 0.0001652304146 ( 0.0001664949467 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 969 ( 3018 ) N2Labels = 0 ( 0 ) TotalLabels = 970 ( 3019 ) NameLabels = 970 ( 1302 ) ColorLabels = 969 ( 3018 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 969 ( 2680 ) N2Labels = 0 ( 0 ) TotalLabels = 970 ( 2681 ) NameLabels = 970 ( 1302 ) ColorLabels = 969 ( 2680 ) 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/N7 b/tests/de/iges_1/N7 index 44e5227ab2..e9dba6218b 100644 --- a/tests/de/iges_1/N7 +++ b/tests/de/iges_1/N7 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 123 ( 123 ) Summary = 3349 ( 3349 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 123 ( 123 ) FreeWire = 7 ( 7 ) FreeEdge = 571 ( 571 ) SharedEdge = 1263 ( 1263 ) TOLERANCE : MaxTol = 0.01306151266 ( 0.01306151266 ) AvgTol = 4.724224752e-005 ( 4.790122037e-005 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 675 ( 1417 ) N2Labels = 0 ( 0 ) TotalLabels = 676 ( 1418 ) NameLabels = 676 ( 745 ) ColorLabels = 675 ( 1417 ) LayerLabels = 584 ( 1236 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 675 ( 1360 ) N2Labels = 0 ( 0 ) TotalLabels = 676 ( 1361 ) NameLabels = 676 ( 745 ) ColorLabels = 675 ( 1360 ) LayerLabels = 584 ( 1185 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = WHITE YELLOW ( WHITE YELLOW ) diff --git a/tests/de/iges_1/P5 b/tests/de/iges_1/P5 index 54df8aa0a5..c61de8f337 100755 --- a/tests/de/iges_1/P5 +++ b/tests/de/iges_1/P5 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 6 ( 8 ) Faces = 6 ( 8 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) Summary = 4710 ( 4574 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2166 ( 2092 ) TOLERANCE : MaxTol = 0.991254355 ( 0.991254355 ) AvgTol = 0.01133191355 ( 0.01225911215 ) -LABELS : N0Labels = 223 ( 223 ) N1Labels = 0 ( 256 ) N2Labels = 0 ( 0 ) TotalLabels = 223 ( 479 ) NameLabels = 223 ( 388 ) ColorLabels = 223 ( 479 ) LayerLabels = 223 ( 479 ) +LABELS : N0Labels = 223 ( 223 ) N1Labels = 0 ( 222 ) N2Labels = 0 ( 0 ) TotalLabels = 223 ( 445 ) NameLabels = 223 ( 389 ) ColorLabels = 223 ( 445 ) LayerLabels = 223 ( 445 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = BLUE1 MAGENTA1 YELLOW ( BLUE1 MAGENTA1 YELLOW ) diff --git a/tests/de/iges_1/P7 b/tests/de/iges_1/P7 index b735728934..ad4d31d775 100644 --- a/tests/de/iges_1/P7 +++ b/tests/de/iges_1/P7 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 770 ( 770 ) Summary = 12751 ( 12759 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 770 ( 770 ) FreeWire = 36 ( 36 ) FreeEdge = 232 ( 232 ) SharedEdge = 5541 ( 5545 ) TOLERANCE : MaxTol = 0.9845041621 ( 0.9845038147 ) AvgTol = 0.00992720939 ( 0.009919874447 ) -LABELS : N0Labels = 880 ( 880 ) N1Labels = 0 ( 1784 ) N2Labels = 0 ( 0 ) TotalLabels = 880 ( 2664 ) NameLabels = 880 ( 1500 ) ColorLabels = 844 ( 2664 ) LayerLabels = 844 ( 2664 ) +LABELS : N0Labels = 880 ( 880 ) N1Labels = 0 ( 620 ) N2Labels = 0 ( 0 ) TotalLabels = 880 ( 1500 ) NameLabels = 880 ( 1500 ) ColorLabels = 844 ( 1500 ) LayerLabels = 844 ( 1500 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = BLACK ( BLACK ) diff --git a/tests/de/iges_1/Q3 b/tests/de/iges_1/Q3 index 679048c1af..622bb23388 100644 --- a/tests/de/iges_1/Q3 +++ b/tests/de/iges_1/Q3 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 899 ( 899 ) Summary = 24030 ( 24038 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 899 ( 899 ) FreeWire = 366 ( 366 ) FreeEdge = 3783 ( 3783 ) SharedEdge = 9384 ( 9388 ) TOLERANCE : MaxTol = 0.3151652209 ( 0.3151652209 ) AvgTol = 0.0007056494899 ( 0.0007458034854 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 3581 ( 9378 ) N2Labels = 0 ( 0 ) TotalLabels = 3582 ( 9379 ) NameLabels = 3582 ( 4454 ) ColorLabels = 3581 ( 9378 ) LayerLabels = 3581 ( 9378 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 3581 ( 7900 ) N2Labels = 0 ( 0 ) TotalLabels = 3582 ( 7901 ) NameLabels = 3582 ( 4454 ) ColorLabels = 3581 ( 7900 ) LayerLabels = 3581 ( 7900 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) COLORS : Colors = TURQUOISE ( TURQUOISE WHITE ) diff --git a/tests/de/iges_1/Q4 b/tests/de/iges_1/Q4 index 5480ead233..b204464bfb 100644 --- a/tests/de/iges_1/Q4 +++ b/tests/de/iges_1/Q4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 426 ( 426 ) Summary = 14321 ( 14321 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 426 ( 426 ) FreeWire = 265 ( 265 ) FreeEdge = 2465 ( 2465 ) SharedEdge = 5781 ( 5781 ) TOLERANCE : MaxTol = 0.09805261731 ( 0.09805261731 ) AvgTol = 0.0005286623368 ( 0.0005262647535 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 1739 ( 5424 ) N2Labels = 0 ( 0 ) TotalLabels = 1740 ( 5425 ) NameLabels = 1740 ( 2237 ) ColorLabels = 1739 ( 5424 ) LayerLabels = 1739 ( 5424 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 1739 ( 4511 ) N2Labels = 0 ( 0 ) TotalLabels = 1740 ( 4512 ) NameLabels = 1740 ( 2237 ) ColorLabels = 1739 ( 4511 ) LayerLabels = 1739 ( 4511 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) COLORS : Colors = TURQUOISE ( TURQUOISE WHITE ) diff --git a/tests/de/iges_1/Q5 b/tests/de/iges_1/Q5 index c49f6edbd7..80350498dc 100644 --- a/tests/de/iges_1/Q5 +++ b/tests/de/iges_1/Q5 @@ -1,6 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" +puts "TODO CR26656 Linux: Error : 1 differences with reference data found" set filename 919-004-T02-01-FT-VL.igs @@ -12,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 406 ( 406 ) Summary = 13718 ( 13718 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 406 ( 406 ) FreeWire = 275 ( 275 ) FreeEdge = 2361 ( 2361 ) SharedEdge = 5553 ( 5553 ) TOLERANCE : MaxTol = 0.08309604195 ( 0.08309604195 ) AvgTol = 0.0004559007514 ( 0.0004699758829 ) -LABELS : N0Labels = 2 ( 2 ) N1Labels = 1614 ( 5210 ) N2Labels = 0 ( 0 ) TotalLabels = 1616 ( 5212 ) NameLabels = 1614 ( 2096 ) ColorLabels = 1614 ( 5211 ) LayerLabels = 1614 ( 5211 ) +LABELS : N0Labels = 2 ( 2 ) N1Labels = 1614 ( 4301 ) N2Labels = 0 ( 0 ) TotalLabels = 1616 ( 4303 ) NameLabels = 1614 ( 2096 ) ColorLabels = 1614 ( 4302 ) LayerLabels = 1614 ( 4302 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) COLORS : Colors = TURQUOISE ( TURQUOISE WHITE ) diff --git a/tests/de/iges_1/Q6 b/tests/de/iges_1/Q6 index dc3031de65..4eae79d09a 100644 --- a/tests/de/iges_1/Q6 +++ b/tests/de/iges_1/Q6 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 1 ( 1 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 181 ( 181 ) Summary = 2235 ( 2235 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 181 ( 181 ) FreeWire = 3 ( 3 ) FreeEdge = 16 ( 16 ) SharedEdge = 934 ( 934 ) TOLERANCE : MaxTol = 0.1814235482 ( 0.1814235485 ) AvgTol = 0.003745633978 ( 0.003756752925 ) -LABELS : N0Labels = 184 ( 359 ) N1Labels = 0 ( 59 ) N2Labels = 0 ( 0 ) TotalLabels = 184 ( 418 ) NameLabels = 184 ( 360 ) ColorLabels = 181 ( 243 ) LayerLabels = 181 ( 243 ) +LABELS : N0Labels = 184 ( 359 ) N1Labels = 0 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 184 ( 362 ) NameLabels = 184 ( 360 ) ColorLabels = 181 ( 187 ) LayerLabels = 181 ( 187 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 3 ) COLORS : Colors = WHITE ( BLACK WHITE YELLOW ) diff --git a/tests/de/iges_1/R1 b/tests/de/iges_1/R1 index a08d6c7f4c..7f5f0933ca 100755 --- a/tests/de/iges_1/R1 +++ b/tests/de/iges_1/R1 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 135 ( 135 ) Summary = 2223 ( 2223 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 135 ( 135 ) FreeWire = 0 ( 0 ) FreeEdge = 3 ( 3 ) SharedEdge = 974 ( 974 ) TOLERANCE : MaxTol = 0.9794163281 ( 12.54323842 ) AvgTol = 0.02080508938 ( 0.1727731057 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 138 ( 1011 ) N2Labels = 0 ( 0 ) TotalLabels = 139 ( 1012 ) NameLabels = 139 ( 205 ) ColorLabels = 138 ( 1011 ) LayerLabels = 138 ( 1011 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 138 ( 758 ) N2Labels = 0 ( 0 ) TotalLabels = 139 ( 759 ) NameLabels = 139 ( 205 ) ColorLabels = 138 ( 758 ) LayerLabels = 138 ( 758 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = GOLD3 MAGENTA4 PLUM1 YELLOW2 ( GOLD3 MAGENTA4 PLUM1 YELLOW2 ) diff --git a/tests/de/iges_1/R4 b/tests/de/iges_1/R4 index 11016ebec7..22a717c6b2 100644 --- a/tests/de/iges_1/R4 +++ b/tests/de/iges_1/R4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 771 ( 771 ) Summary = 15422 ( 15404 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 771 ( 771 ) FreeWire = 0 ( 0 ) FreeEdge = 1291 ( 1291 ) SharedEdge = 6301 ( 6303 ) TOLERANCE : MaxTol = 0.9439922085 ( 0.944086605 ) AvgTol = 0.005963915093 ( 0.005983396104 ) -LABELS : N0Labels = 2062 ( 2062 ) N1Labels = 6 ( 1153 ) N2Labels = 0 ( 0 ) TotalLabels = 2068 ( 3215 ) NameLabels = 2062 ( 2062 ) ColorLabels = 2037 ( 3215 ) LayerLabels = 2037 ( 3215 ) +LABELS : N0Labels = 2062 ( 2062 ) N1Labels = 6 ( 1047 ) N2Labels = 0 ( 0 ) TotalLabels = 2068 ( 3109 ) NameLabels = 2062 ( 2062 ) ColorLabels = 2037 ( 3109 ) LayerLabels = 2037 ( 3109 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) COLORS : Colors = BLACK MAGENTA1 RED ( BLACK MAGENTA1 RED WHITE ) diff --git a/tests/de/iges_1/R5 b/tests/de/iges_1/R5 index a4e92dfd51..6e8db28e2a 100644 --- a/tests/de/iges_1/R5 +++ b/tests/de/iges_1/R5 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 328 ( 328 ) Summary = 8546 ( 8546 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 328 ( 328 ) FreeWire = 53 ( 53 ) FreeEdge = 1431 ( 1431 ) SharedEdge = 3217 ( 3217 ) TOLERANCE : MaxTol = 0.4274072109 ( 0.4274072101 ) AvgTol = 0.001821024602 ( 0.001852637256 ) -LABELS : N0Labels = 10 ( 10 ) N1Labels = 1565 ( 2843 ) N2Labels = 0 ( 0 ) TotalLabels = 1575 ( 2853 ) NameLabels = 1575 ( 1851 ) ColorLabels = 1570 ( 2848 ) LayerLabels = 1570 ( 2848 ) +LABELS : N0Labels = 10 ( 10 ) N1Labels = 1565 ( 2565 ) N2Labels = 0 ( 0 ) TotalLabels = 1575 ( 2575 ) NameLabels = 1575 ( 1851 ) ColorLabels = 1570 ( 2570 ) LayerLabels = 1570 ( 2570 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) COLORS : Colors = BLUE1 GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ( BLUE1 GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) diff --git a/tests/de/iges_2/A4 b/tests/de/iges_2/A4 index e72114a0b2..1f2685ec8a 100644 --- a/tests/de/iges_2/A4 +++ b/tests/de/iges_2/A4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 622 ( 311 ) Summary = 23710 ( 11832 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 622 ( 622 ) FreeWire = 816 ( 816 ) FreeEdge = 4824 ( 4824 ) SharedEdge = 10126 ( 5051 ) TOLERANCE : MaxTol = 0.6427268663 ( 4.452116544 ) AvgTol = 0.01239717192 ( 0.01380706073 ) -LABELS : N0Labels = 7 ( 7 ) N1Labels = 379 ( 3264 ) N2Labels = 0 ( 0 ) TotalLabels = 386 ( 3271 ) NameLabels = 386 ( 1010 ) ColorLabels = 381 ( 3266 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 7 ( 7 ) N1Labels = 379 ( 1004 ) N2Labels = 0 ( 0 ) TotalLabels = 386 ( 1011 ) NameLabels = 386 ( 1010 ) ColorLabels = 381 ( 1006 ) 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_2/A7 b/tests/de/iges_2/A7 index 71415e427d..8b4bff45d8 100644 --- a/tests/de/iges_2/A7 +++ b/tests/de/iges_2/A7 @@ -16,7 +16,7 @@ CHECKSHAPE : Wires = 1 ( 1 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 539 ( 539 ) Summary = 12798 ( 12800 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 539 ( 539 ) FreeWire = 19 ( 21 ) FreeEdge = 1864 ( 1864 ) SharedEdge = 4957 ( 4957 ) TOLERANCE : MaxTol = 0.7510769849 ( 0.7510769849 ) AvgTol = 0.006853010548 ( 0.007168795519 ) -LABELS : N0Labels = 65 ( 65 ) N1Labels = 2112 ( 4351 ) N2Labels = 0 ( 0 ) TotalLabels = 2177 ( 4416 ) NameLabels = 2177 ( 2778 ) ColorLabels = 2123 ( 4366 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 65 ( 65 ) N1Labels = 2112 ( 4067 ) N2Labels = 0 ( 0 ) TotalLabels = 2177 ( 4132 ) NameLabels = 2177 ( 2778 ) ColorLabels = 2123 ( 4082 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) COLORS : Colors = BLUE1 WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) diff --git a/tests/de/iges_2/A9 b/tests/de/iges_2/A9 index dfb3c16e64..a3e526705e 100755 --- a/tests/de/iges_2/A9 +++ b/tests/de/iges_2/A9 @@ -10,10 +10,10 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 56 ( 12 ) Summary = 56 ( 12 ) CHECKSHAPE : Wires = 2 ( 1 ) Faces = 2 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 1106 ) Summary = 59777 ( 25971 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 2342 ) FreeWire = 2328 ( 2328 ) FreeEdge = 14016 ( 14016 ) SharedEdge = 24558 ( 10688 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 1106 ) Summary = 59777 ( 25981 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 2342 ) FreeWire = 2328 ( 2328 ) FreeEdge = 14016 ( 14016 ) SharedEdge = 24558 ( 10692 ) TOLERANCE : MaxTol = 0.9711309062 ( 0.9711309063 ) AvgTol = 0.01916076754 ( 0.01948753951 ) -LABELS : N0Labels = 250 ( 250 ) N1Labels = 2268 ( 3204 ) N2Labels = 0 ( 0 ) TotalLabels = 2518 ( 3454 ) NameLabels = 2518 ( 3453 ) ColorLabels = 2512 ( 3448 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 250 ( 250 ) N1Labels = 2268 ( 3202 ) N2Labels = 0 ( 0 ) TotalLabels = 2518 ( 3452 ) NameLabels = 2518 ( 3452 ) ColorLabels = 2512 ( 3446 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = CYAN1 LIGHTPINK PALEGOLDENROD ROSYBROWN ( CYAN1 LIGHTPINK PALEGOLDENROD ROSYBROWN ) diff --git a/tests/de/iges_2/B3 b/tests/de/iges_2/B3 index 5533c4f950..c0fedb111c 100644 --- a/tests/de/iges_2/B3 +++ b/tests/de/iges_2/B3 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4004 ( 4004 ) Summary = 46702 ( 46701 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4004 ( 4004 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 19350 ( 19350 ) TOLERANCE : MaxTol = 0.01077402956 ( 0.005387073003 ) AvgTol = 4.979806751e-006 ( 9.076797721e-006 ) -LABELS : N0Labels = 4004 ( 4004 ) N1Labels = 0 ( 901 ) N2Labels = 0 ( 0 ) TotalLabels = 4004 ( 4905 ) NameLabels = 4004 ( 4004 ) ColorLabels = 248 ( 1149 ) LayerLabels = 3366 ( 4267 ) +LABELS : N0Labels = 4004 ( 4004 ) N1Labels = 0 ( 647 ) N2Labels = 0 ( 0 ) TotalLabels = 4004 ( 4651 ) NameLabels = 4004 ( 4004 ) ColorLabels = 248 ( 895 ) LayerLabels = 3366 ( 4013 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = BLACK RED YELLOW ( BLACK RED YELLOW ) diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8 index 305198703d..e5aec2575d 100644 --- a/tests/de/iges_2/B8 +++ b/tests/de/iges_2/B8 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 8 ( 11 ) Faces = 8 ( 7 ) Shells = 0 ( 0 ) S NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) Summary = 63158 ( 63146 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) FreeWire = 18 ( 18 ) FreeEdge = 452 ( 452 ) SharedEdge = 26798 ( 26797 ) TOLERANCE : MaxTol = 0.9804479161 ( 0.9805459497 ) AvgTol = 0.01153089031 ( 0.01154870945 ) -LABELS : N0Labels = 5089 ( 5165 ) N1Labels = 26 ( 3834 ) N2Labels = 0 ( 0 ) TotalLabels = 5115 ( 8999 ) NameLabels = 5089 ( 5165 ) ColorLabels = 5086 ( 8923 ) LayerLabels = 5086 ( 8923 ) +LABELS : N0Labels = 5089 ( 5165 ) N1Labels = 26 ( 3688 ) N2Labels = 0 ( 0 ) TotalLabels = 5115 ( 8853 ) NameLabels = 5089 ( 5165 ) ColorLabels = 5086 ( 8777 ) LayerLabels = 5086 ( 8777 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = BLUE1 CYAN1 GREEN ( BLUE1 CYAN1 GREEN ) diff --git a/tests/de/iges_2/C3 b/tests/de/iges_2/C3 index 8b7e453756..05475e2524 100644 --- a/tests/de/iges_2/C3 +++ b/tests/de/iges_2/C3 @@ -1,6 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR23096 ALL: LAYERS : Faulty" set filename PRO11414-1.igs @@ -12,11 +11,11 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 309 ( 309 ) Summary = 14820 ( 14815 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 309 ( 309 ) FreeWire = 22 ( 22 ) FreeEdge = 1789 ( 1789 ) SharedEdge = 6249 ( 6249 ) TOLERANCE : MaxTol = 0.75178756 ( 0.7517875657 ) AvgTol = 0.001674556495 ( 0.001679070069 ) -LABELS : N0Labels = 2030 ( 2204 ) N1Labels = 8 ( 673 ) N2Labels = 0 ( 0 ) TotalLabels = 2038 ( 2877 ) NameLabels = 2030 ( 2204 ) ColorLabels = 2006 ( 2703 ) LayerLabels = 2006 ( 2703 ) +LABELS : N0Labels = 2030 ( 2204 ) N1Labels = 8 ( 341 ) N2Labels = 0 ( 0 ) TotalLabels = 2038 ( 2545 ) NameLabels = 2030 ( 2204 ) ColorLabels = 2006 ( 2371 ) LayerLabels = 2006 ( 2371 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 12 ( 12 ) COLORS : Colors = GRAY61 GREEN LIGHTSALMON2 MAGENTA1 MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ( GRAY61 GREEN LIGHTSALMON2 MAGENTA1 MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ) -NLAYERS : NLayers = 5 ( 6 ) -LAYERS : Layers = 107 109 152 155 156 ( 107 109 150 152 155 156 ) +NLAYERS : NLayers = 5 ( 5 ) +LAYERS : Layers = 107 109 152 155 156 ( 107 109 152 155 156 ) } diff --git a/tests/de/iges_2/D1 b/tests/de/iges_2/D1 index fde9bd9633..8f6beac884 100755 --- a/tests/de/iges_2/D1 +++ b/tests/de/iges_2/D1 @@ -2,6 +2,7 @@ puts "TODO CR23096 ALL: DATA : Faulty" puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" +puts "TODO CR26656 Linux: Error : 1 differences with reference data found" set filename support_rampe.igs @@ -13,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 169 ( 169 ) Summary = 5348 ( 5348 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 169 ( 169 ) FreeWire = 49 ( 49 ) FreeEdge = 945 ( 945 ) SharedEdge = 2041 ( 2041 ) TOLERANCE : MaxTol = 0.1765497108 ( 0.1765497101 ) AvgTol = 0.0004116969813 ( 0.0004153236787 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 981 ( 2195 ) N2Labels = 0 ( 0 ) TotalLabels = 982 ( 2196 ) NameLabels = 982 ( 1142 ) ColorLabels = 981 ( 2195 ) LayerLabels = 981 ( 2195 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 981 ( 2033 ) N2Labels = 0 ( 0 ) TotalLabels = 982 ( 2034 ) NameLabels = 982 ( 1142 ) ColorLabels = 981 ( 2033 ) LayerLabels = 981 ( 2033 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 WHITE YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 WHITE YELLOW ) diff --git a/tests/de/iges_2/E1 b/tests/de/iges_2/E1 index fc776757a1..384968f9e0 100644 --- a/tests/de/iges_2/E1 +++ b/tests/de/iges_2/E1 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 12 ( 6 ) Summary = 743 ( 624 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 12 ( 12 ) FreeWire = 40 ( 40 ) FreeEdge = 188 ( 188 ) SharedEdge = 296 ( 242 ) TOLERANCE : MaxTol = 0.2600681266 ( 7.241630725 ) AvgTol = 0.03297721346 ( 0.4073375928 ) -LABELS : N0Labels = 7 ( 7 ) N1Labels = 44 ( 98 ) N2Labels = 0 ( 0 ) TotalLabels = 51 ( 105 ) NameLabels = 51 ( 97 ) ColorLabels = 50 ( 104 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 7 ( 7 ) N1Labels = 44 ( 90 ) N2Labels = 0 ( 0 ) TotalLabels = 51 ( 97 ) NameLabels = 51 ( 97 ) ColorLabels = 50 ( 96 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = RED WHITE ( RED WHITE ) diff --git a/tests/de/iges_2/E3 b/tests/de/iges_2/E3 index 89a7b730f0..158d435c0e 100644 --- a/tests/de/iges_2/E3 +++ b/tests/de/iges_2/E3 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) Summary = 2504 ( 2504 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 208 ( 208 ) FreeWire = 0 ( 0 ) FreeEdge = 6 ( 6 ) SharedEdge = 1038 ( 1038 ) TOLERANCE : MaxTol = 0.08198937243 ( 0.08606507237 ) AvgTol = 0.003492787826 ( 0.004037916818 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 1175 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 1176 ) NameLabels = 215 ( 311 ) ColorLabels = 214 ( 1175 ) LayerLabels = 214 ( 1175 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 912 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 913 ) NameLabels = 215 ( 311 ) ColorLabels = 214 ( 912 ) LayerLabels = 214 ( 912 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) COLORS : Colors = BLUE1 GRAY73 WHITE YELLOW ( BLUE1 GRAY73 GREEN WHITE YELLOW ) diff --git a/tests/de/iges_2/E4 b/tests/de/iges_2/E4 index bdce50d263..2304e4711c 100644 --- a/tests/de/iges_2/E4 +++ b/tests/de/iges_2/E4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 47 ( 47 ) Summary = 1536 ( 1536 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 47 ( 47 ) FreeWire = 1 ( 1 ) FreeEdge = 2 ( 2 ) SharedEdge = 719 ( 719 ) TOLERANCE : MaxTol = 0.4901518209 ( 0.4901518209 ) AvgTol = 0.01740968658 ( 0.01741670629 ) -LABELS : N0Labels = 48 ( 48 ) N1Labels = 0 ( 390 ) N2Labels = 0 ( 0 ) TotalLabels = 48 ( 438 ) NameLabels = 48 ( 77 ) ColorLabels = 47 ( 438 ) LayerLabels = 47 ( 438 ) +LABELS : N0Labels = 48 ( 48 ) N1Labels = 0 ( 284 ) N2Labels = 0 ( 0 ) TotalLabels = 48 ( 332 ) NameLabels = 48 ( 77 ) ColorLabels = 47 ( 332 ) LayerLabels = 47 ( 332 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) COLORS : Colors = MAGENTA1 ( MAGENTA1 YELLOW ) diff --git a/tests/de/iges_2/E6 b/tests/de/iges_2/E6 index 3da5177274..fb5c6b3f1d 100644 --- a/tests/de/iges_2/E6 +++ b/tests/de/iges_2/E6 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1177 ( 1177 ) Summary = 18232 ( 18230 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1177 ( 1177 ) FreeWire = 5 ( 5 ) FreeEdge = 714 ( 714 ) SharedEdge = 7614 ( 7614 ) TOLERANCE : MaxTol = 0.8261873294 ( 0.8261873283 ) AvgTol = 0.01075755448 ( 0.01076339213 ) -LABELS : N0Labels = 1884 ( 1885 ) N1Labels = 0 ( 1020 ) N2Labels = 0 ( 0 ) TotalLabels = 1884 ( 2905 ) NameLabels = 1884 ( 1885 ) ColorLabels = 1873 ( 2904 ) LayerLabels = 1873 ( 2904 ) +LABELS : N0Labels = 1884 ( 1885 ) N1Labels = 0 ( 986 ) N2Labels = 0 ( 0 ) TotalLabels = 1884 ( 2871 ) NameLabels = 1884 ( 1885 ) ColorLabels = 1873 ( 2870 ) LayerLabels = 1873 ( 2870 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) COLORS : Colors = BLACK BLUE1 CYAN1 GREEN RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN RED WHITE YELLOW ) diff --git a/tests/de/iges_2/E7 b/tests/de/iges_2/E7 index 7987286f79..025d6a0311 100644 --- a/tests/de/iges_2/E7 +++ b/tests/de/iges_2/E7 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 1 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1628 ( 1628 ) Summary = 21878 ( 21886 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1628 ( 1628 ) FreeWire = 16 ( 17 ) FreeEdge = 625 ( 625 ) SharedEdge = 9294 ( 9298 ) TOLERANCE : MaxTol = 0.9993613167 ( 0.9993613167 ) AvgTol = 0.01637966588 ( 0.01644116474 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 1632 ( 3624 ) N2Labels = 0 ( 0 ) TotalLabels = 1635 ( 3627 ) NameLabels = 1635 ( 2037 ) ColorLabels = 1632 ( 3626 ) LayerLabels = 1632 ( 3626 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 1632 ( 3592 ) N2Labels = 0 ( 0 ) TotalLabels = 1635 ( 3595 ) NameLabels = 1635 ( 2037 ) ColorLabels = 1632 ( 3594 ) LayerLabels = 1632 ( 3594 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) COLORS : Colors = BLUE1 GREEN MAGENTA1 ( BLUE1 GREEN MAGENTA1 RED ) diff --git a/tests/de/iges_2/F3 b/tests/de/iges_2/F3 index 533dece79a..2859a34244 100755 --- a/tests/de/iges_2/F3 +++ b/tests/de/iges_2/F3 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 211 ( 211 ) Summary = 12556 ( 12569 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 211 ( 211 ) FreeWire = 255 ( 267 ) FreeEdge = 3643 ( 3643 ) SharedEdge = 5784 ( 5784 ) TOLERANCE : MaxTol = 0.9498862984 ( 0.9498862984 ) AvgTol = 0.008210118978 ( 0.008216800661 ) -LABELS : N0Labels = 3 ( 6 ) N1Labels = 454 ( 1941 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 1947 ) NameLabels = 393 ( 870 ) ColorLabels = 454 ( 1938 ) LayerLabels = 386 ( 1921 ) +LABELS : N0Labels = 3 ( 6 ) N1Labels = 454 ( 1912 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 1918 ) NameLabels = 393 ( 870 ) ColorLabels = 454 ( 1909 ) LayerLabels = 386 ( 1892 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 7 ) COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4 index 4ab80df393..050bacf8f2 100755 --- a/tests/de/iges_2/F4 +++ b/tests/de/iges_2/F4 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 5 ( 6 ) Faces = 5 ( 6 ) Shells = 0 ( 0 ) So 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 ) +LABELS : N0Labels = 12 ( 30 ) N1Labels = 3661 ( 3664 ) N2Labels = 0 ( 0 ) TotalLabels = 3673 ( 3694 ) NameLabels = 1379 ( 3694 ) ColorLabels = 3661 ( 3660 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 11 ) COLORS : Colors = BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE ( BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE YELLOW ) diff --git a/tests/de/iges_2/F9 b/tests/de/iges_2/F9 index 7db870a87d..c3059282ab 100644 --- a/tests/de/iges_2/F9 +++ b/tests/de/iges_2/F9 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 3 ) Faces = 0 ( 3 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1457 ( 1455 ) Summary = 38832 ( 38834 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1457 ( 1455 ) FreeWire = 516 ( 528 ) FreeEdge = 6208 ( 6208 ) SharedEdge = 15307 ( 15304 ) TOLERANCE : MaxTol = 0.3053256329 ( 0.4653265763 ) AvgTol = 0.0008083573819 ( 0.0008563940583 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 5689 ( 14457 ) N2Labels = 0 ( 0 ) TotalLabels = 5694 ( 14462 ) NameLabels = 5694 ( 7040 ) ColorLabels = 5689 ( 14461 ) LayerLabels = 5689 ( 14461 ) +LABELS : N0Labels = 5 ( 5 ) N1Labels = 5689 ( 12405 ) N2Labels = 0 ( 0 ) TotalLabels = 5694 ( 12410 ) NameLabels = 5694 ( 7040 ) ColorLabels = 5689 ( 12409 ) LayerLabels = 5689 ( 12409 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) COLORS : Colors = TURQUOISE WHITE ( TURQUOISE WHITE ) diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1 index 19269cf1b1..2b510dd1f4 100755 --- a/tests/de/iges_2/G1 +++ b/tests/de/iges_2/G1 @@ -13,8 +13,8 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 69 ( 41 ) Summary = 69 ( 41 ) CHECKSHAPE : Wires = 8 ( 5 ) Faces = 8 ( 5 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 2314 ) Summary = 112057 ( 71744 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44964 ( 28779 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 2314 ) Summary = 112057 ( 71781 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44964 ( 28799 ) TOLERANCE : MaxTol = 0.9133007093 ( 0.9133008813 ) AvgTol = 0.005629101837 ( 0.005904201197 ) LABELS : N0Labels = 24 ( 24 ) N1Labels = 5153 ( 6559 ) N2Labels = 0 ( 0 ) TotalLabels = 5177 ( 6583 ) NameLabels = 5177 ( 6583 ) ColorLabels = 5153 ( 6559 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) diff --git a/tests/de/iges_2/G8 b/tests/de/iges_2/G8 index 330327d996..52c800390e 100644 --- a/tests/de/iges_2/G8 +++ b/tests/de/iges_2/G8 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 253 ( 253 ) Summary = 5359 ( 5363 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 253 ( 253 ) FreeWire = 7 ( 10 ) FreeEdge = 78 ( 78 ) SharedEdge = 2412 ( 2412 ) TOLERANCE : MaxTol = 0.04838312754 ( 0.0483782783 ) AvgTol = 0.002925020972 ( 0.002891060102 ) -LABELS : N0Labels = 8 ( 8 ) N1Labels = 269 ( 2698 ) N2Labels = 0 ( 0 ) TotalLabels = 277 ( 2706 ) NameLabels = 277 ( 384 ) ColorLabels = 272 ( 2704 ) LayerLabels = 272 ( 2704 ) +LABELS : N0Labels = 8 ( 8 ) N1Labels = 269 ( 2591 ) N2Labels = 0 ( 0 ) TotalLabels = 277 ( 2599 ) NameLabels = 277 ( 384 ) ColorLabels = 272 ( 2597 ) LayerLabels = 272 ( 2597 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) COLORS : Colors = BLUE1 WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) diff --git a/tests/de/iges_2/G9 b/tests/de/iges_2/G9 index b1d385b639..f805427025 100755 --- a/tests/de/iges_2/G9 +++ b/tests/de/iges_2/G9 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2639 ( 2634 ) Summary = 64362 ( 64317 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2639 ( 2639 ) FreeWire = 1027 ( 1027 ) FreeEdge = 10489 ( 10489 ) SharedEdge = 24209 ( 24190 ) TOLERANCE : MaxTol = 0.05705560511 ( 0.05705560511 ) AvgTol = 0.0002545958154 ( 0.0002529561285 ) -LABELS : N0Labels = 54 ( 54 ) N1Labels = 10590 ( 27120 ) N2Labels = 0 ( 0 ) TotalLabels = 10644 ( 27174 ) NameLabels = 10644 ( 13414 ) ColorLabels = 10590 ( 27172 ) LayerLabels = 7 ( 18 ) +LABELS : N0Labels = 54 ( 54 ) N1Labels = 10590 ( 24663 ) N2Labels = 0 ( 0 ) TotalLabels = 10644 ( 24717 ) NameLabels = 10644 ( 13414 ) ColorLabels = 10590 ( 24715 ) LayerLabels = 7 ( 15 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) COLORS : Colors = BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_2/I3 b/tests/de/iges_2/I3 index 1f7c32f31c..2a79b96ce1 100644 --- a/tests/de/iges_2/I3 +++ b/tests/de/iges_2/I3 @@ -14,7 +14,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 78 ( 78 ) Summary = 5036 ( 5295 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 78 ( 78 ) FreeWire = 75 ( 334 ) FreeEdge = 1251 ( 1251 ) SharedEdge = 1965 ( 1965 ) TOLERANCE : MaxTol = 0.2578298329 ( 0.2578045038 ) AvgTol = 0.001358353951 ( 0.00164678188 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 880 ( 1523 ) N2Labels = 0 ( 0 ) TotalLabels = 881 ( 1524 ) NameLabels = 881 ( 1008 ) ColorLabels = 880 ( 1523 ) LayerLabels = 858 ( 1496 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 880 ( 1446 ) N2Labels = 0 ( 0 ) TotalLabels = 881 ( 1447 ) NameLabels = 881 ( 1008 ) ColorLabels = 880 ( 1446 ) LayerLabels = 858 ( 1419 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 7 ) COLORS : Colors = DODGERBLUE2 GREEN MAGENTA3 TURQUOISE2 WHITE ( DODGERBLUE2 GRAY80 GREEN MAGENTA3 TURQUOISE2 WHITE YELLOW3 ) diff --git a/tests/de/iges_2/I4 b/tests/de/iges_2/I4 index e3ea1788b6..1115de4280 100644 --- a/tests/de/iges_2/I4 +++ b/tests/de/iges_2/I4 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 96 ( 96 ) Summary = 2333 ( 2333 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 96 ( 96 ) FreeWire = 14 ( 14 ) FreeEdge = 360 ( 360 ) SharedEdge = 871 ( 871 ) TOLERANCE : MaxTol = 0.9808242672 ( 0.9808242374 ) AvgTol = 0.004966469755 ( 0.004962254462 ) -LABELS : N0Labels = 4 ( 4 ) N1Labels = 422 ( 765 ) N2Labels = 0 ( 0 ) TotalLabels = 426 ( 769 ) NameLabels = 426 ( 528 ) ColorLabels = 422 ( 765 ) LayerLabels = 422 ( 765 ) +LABELS : N0Labels = 4 ( 4 ) N1Labels = 422 ( 732 ) N2Labels = 0 ( 0 ) TotalLabels = 426 ( 736 ) NameLabels = 426 ( 528 ) ColorLabels = 422 ( 732 ) LayerLabels = 422 ( 732 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 8 ) COLORS : Colors = BLUE1 GREEN3 RED TURQUOISE1 WHITE YELLOW ( BLUE1 GREEN3 GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) diff --git a/tests/de/iges_2/I5 b/tests/de/iges_2/I5 index ae1843f15f..96fa840e5f 100755 --- a/tests/de/iges_2/I5 +++ b/tests/de/iges_2/I5 @@ -13,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 854 ( 702 ) Summary = 25375 ( 23837 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 854 ( 854 ) FreeWire = 9 ( 31 ) FreeEdge = 3865 ( 3865 ) SharedEdge = 9820 ( 9202 ) TOLERANCE : MaxTol = 0.9589015104 ( 0.9589015104 ) AvgTol = 0.01827507861 ( 0.01834335655 ) -LABELS : N0Labels = 33 ( 33 ) N1Labels = 4502 ( 6695 ) N2Labels = 0 ( 0 ) TotalLabels = 4535 ( 6728 ) NameLabels = 4535 ( 4624 ) ColorLabels = 4522 ( 6715 ) LayerLabels = 4281 ( 6430 ) +LABELS : N0Labels = 33 ( 33 ) N1Labels = 4502 ( 6687 ) N2Labels = 0 ( 0 ) TotalLabels = 4535 ( 6720 ) NameLabels = 4535 ( 4624 ) ColorLabels = 4522 ( 6707 ) LayerLabels = 4281 ( 6430 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 9 ) COLORS : Colors = BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GRAY80 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_2/I8 b/tests/de/iges_2/I8 index fd83ed6635..78316b7a5d 100755 --- a/tests/de/iges_2/I8 +++ b/tests/de/iges_2/I8 @@ -16,7 +16,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 186 ( 186 ) Summary = 9601 ( 9691 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 186 ( 186 ) FreeWire = 200 ( 290 ) FreeEdge = 2010 ( 2010 ) SharedEdge = 4167 ( 4167 ) TOLERANCE : MaxTol = 0.5957823778 ( 0.5957823778 ) AvgTol = 0.002462709632 ( 0.002802777852 ) -LABELS : N0Labels = 2 ( 2 ) N1Labels = 657 ( 1428 ) N2Labels = 0 ( 0 ) TotalLabels = 659 ( 1430 ) NameLabels = 659 ( 1008 ) ColorLabels = 657 ( 1428 ) LayerLabels = 440 ( 1106 ) +LABELS : N0Labels = 2 ( 2 ) N1Labels = 657 ( 1422 ) N2Labels = 0 ( 0 ) TotalLabels = 659 ( 1424 ) NameLabels = 659 ( 1008 ) ColorLabels = 657 ( 1422 ) LayerLabels = 440 ( 1100 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 10 ) COLORS : Colors = BLUE1 BURLYWOOD1 CYAN1 DEEPSKYBLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 BURLYWOOD1 CYAN1 DEEPSKYBLUE1 GREEN LEMONCHIFFON1 MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_2/I9 b/tests/de/iges_2/I9 index bde71caa3b..a7292a25a4 100644 --- a/tests/de/iges_2/I9 +++ b/tests/de/iges_2/I9 @@ -16,7 +16,7 @@ CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 117 ( 117 ) Summary = 9970 ( 10003 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 117 ( 117 ) FreeWire = 60 ( 93 ) FreeEdge = 2720 ( 2720 ) SharedEdge = 3521 ( 3521 ) TOLERANCE : MaxTol = 0.7859817704 ( 0.7859817704 ) AvgTol = 0.005733330289 ( 0.006491446419 ) -LABELS : N0Labels = 2 ( 2 ) N1Labels = 2639 ( 3327 ) N2Labels = 0 ( 0 ) TotalLabels = 2641 ( 3329 ) NameLabels = 2641 ( 2850 ) ColorLabels = 2639 ( 3327 ) LayerLabels = 2607 ( 3290 ) +LABELS : N0Labels = 2 ( 2 ) N1Labels = 2639 ( 3216 ) N2Labels = 0 ( 0 ) TotalLabels = 2641 ( 3218 ) NameLabels = 2641 ( 2850 ) ColorLabels = 2639 ( 3216 ) LayerLabels = 2607 ( 3179 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 9 ) COLORS : Colors = CYAN1 DARKOLIVEGREEN2 GRAY67 LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 TAN1 ( CYAN1 DARKOLIVEGREEN2 GRAY67 HONEYDEW LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 PALETURQUOISE1 TAN1 ) diff --git a/tests/de/iges_3/A2 b/tests/de/iges_3/A2 index 473028b1f8..c2d2884c17 100755 --- a/tests/de/iges_3/A2 +++ b/tests/de/iges_3/A2 @@ -17,7 +17,7 @@ CHECKSHAPE : Wires = 1 ( 1 ) Faces = 3 ( 2 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 421 ( 159 ) Summary = 7850 ( 4452 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 421 ( 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 ( 1831 ) N2Labels = 0 ( 0 ) TotalLabels = 328 ( 1834 ) NameLabels = 328 ( 425 ) ColorLabels = 325 ( 1831 ) LayerLabels = 193 ( 1566 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 325 ( 1665 ) N2Labels = 0 ( 0 ) TotalLabels = 328 ( 1668 ) NameLabels = 328 ( 425 ) ColorLabels = 325 ( 1665 ) LayerLabels = 193 ( 1453 ) 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/iges_3/A3 b/tests/de/iges_3/A3 index ee8fb41456..9e6c600484 100755 --- a/tests/de/iges_3/A3 +++ b/tests/de/iges_3/A3 @@ -16,7 +16,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 79 ( 79 ) Summary = 3800 ( 3951 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 79 ( 79 ) FreeWire = 79 ( 230 ) FreeEdge = 865 ( 865 ) SharedEdge = 1481 ( 1481 ) TOLERANCE : MaxTol = 0.06847151261 ( 0.8635005927 ) AvgTol = 0.00133710651 ( 0.003525405269 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 596 ( 1119 ) N2Labels = 0 ( 0 ) TotalLabels = 597 ( 1120 ) NameLabels = 597 ( 745 ) ColorLabels = 596 ( 1119 ) LayerLabels = 577 ( 1100 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 596 ( 1004 ) N2Labels = 0 ( 0 ) TotalLabels = 597 ( 1005 ) NameLabels = 597 ( 745 ) ColorLabels = 596 ( 1004 ) LayerLabels = 577 ( 985 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 7 ) COLORS : Colors = DODGERBLUE2 GREEN MAGENTA3 TURQUOISE2 WHITE ( DODGERBLUE2 GRAY80 GREEN MAGENTA3 TURQUOISE2 WHITE YELLOW3 ) diff --git a/tests/de/iges_3/A9 b/tests/de/iges_3/A9 index 2cc49321f1..4610466ff4 100644 --- a/tests/de/iges_3/A9 +++ b/tests/de/iges_3/A9 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 6500 ( 6500 ) Summary = 158096 ( 158092 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 6500 ( 6500 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 72656 ( 72654 ) TOLERANCE : MaxTol = 0.9560441943 ( 0.9560441934 ) AvgTol = 0.001956426418 ( 0.001954522593 ) -LABELS : N0Labels = 6500 ( 6500 ) N1Labels = 0 ( 25582 ) N2Labels = 0 ( 0 ) TotalLabels = 6500 ( 32082 ) NameLabels = 6500 ( 6500 ) ColorLabels = 6500 ( 32082 ) LayerLabels = 6500 ( 32082 ) +LABELS : N0Labels = 6500 ( 6500 ) N1Labels = 0 ( 25540 ) N2Labels = 0 ( 0 ) TotalLabels = 6500 ( 32040 ) NameLabels = 6500 ( 6500 ) ColorLabels = 6500 ( 32040 ) LayerLabels = 6500 ( 32040 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = YELLOW ( YELLOW )