From 02fd709bbbecd924df255472822c8c4ebe259c82 Mon Sep 17 00:00:00 2001 From: ika Date: Fri, 19 Feb 2016 14:05:43 +0300 Subject: [PATCH] 0026930: ShapeConstruct_ProjectCurveOnSurface returns a B-Spline instead of line (again) Upgrade check of closeness of 2dcurve to line during projection: For C1 and more surfaces check distance to normal, not to surface, for C0 surfaces update tolerance formula. Add check for possible period jump in some inner point. Update some test cases. Add cache saving for lines, update fixPeriodicTroubles() function, using parameters from cashe. Small correction of test cases for issue #26930 fix processing of points from cache. Update of test cases according to the new behavior Fix behavior of fixPeriodicityTroubles() on different isolines, fix copy/paste mistake. Update test cases: iges_2 C4 - return to master values step_3 E6 - improvement. --- src/QABugs/QABugs_20.cxx | 56 ++++ .../ShapeConstruct_ProjectCurveOnSurface.cxx | 305 ++++++++++++++---- .../ShapeConstruct_ProjectCurveOnSurface.hxx | 2 +- tests/bugs/heal/bug26930_1 | 14 + tests/bugs/heal/bug26930_2 | 14 + tests/de/iges_1/J3 | 6 +- tests/de/iges_1/K3 | 14 +- tests/de/iges_1/L1 | 6 +- tests/de/iges_1/O5 | 10 +- tests/de/iges_1/P5 | 2 +- tests/de/iges_2/A4 | 9 +- tests/de/iges_2/A8 | 9 +- tests/de/iges_2/B1 | 13 +- tests/de/iges_2/B8 | 11 +- tests/de/iges_2/C2 | 12 +- tests/de/iges_2/C4 | 12 +- tests/de/iges_2/D9 | 9 +- tests/de/iges_2/E3 | 5 +- tests/de/iges_2/G1 | 12 +- tests/de/iges_2/G7 | 13 +- tests/de/iges_2/I3 | 7 +- tests/de/iges_2/I9 | 5 +- tests/de/step_1/C3 | 3 +- tests/de/step_1/J6 | 14 +- tests/de/step_1/L7 | 4 +- tests/de/step_1/ZC6 | 4 +- tests/de/step_1/ZJ7 | 2 +- tests/de/step_1/ZQ2 | 5 +- tests/de/step_2/B4 | 5 +- tests/de/step_2/E7 | 12 +- tests/de/step_2/G6 | 7 +- tests/de/step_2/M7 | 4 +- tests/de/step_2/S1 | 6 +- tests/de/step_2/S9 | 4 +- tests/de/step_2/Y5 | 6 +- tests/de/step_3/A5 | 11 +- tests/de/step_3/C9 | 8 +- tests/de/step_3/D8 | 6 +- tests/de/step_3/D9 | 7 +- tests/de/step_3/E6 | 9 +- tests/de/step_3/E7 | 4 +- tests/de/step_3/E8 | 4 +- tests/de/step_4/H5 | 4 +- tests/de/step_4/H8 | 4 +- tests/de/step_4/I3 | 5 +- tests/de/step_5/A1 | 12 +- tests/de/step_5/A3 | 4 +- tests/heal/wire_tails_real/A5 | 2 +- 48 files changed, 471 insertions(+), 231 deletions(-) create mode 100644 tests/bugs/heal/bug26930_1 create mode 100644 tests/bugs/heal/bug26930_2 diff --git a/src/QABugs/QABugs_20.cxx b/src/QABugs/QABugs_20.cxx index 9e619f1567..d4e48122d3 100644 --- a/src/QABugs/QABugs_20.cxx +++ b/src/QABugs/QABugs_20.cxx @@ -24,7 +24,11 @@ #include #include #include +#include +#include +#include #include +#include #include #include @@ -1515,6 +1519,57 @@ static Standard_Integer OCC27235 (Draw_Interpretor& theDI, Standard_Integer n, c return 0; } +//======================================================================= +//function : OCC24836 +//purpose : +//======================================================================= +static Standard_Integer OCC26930(Draw_Interpretor& theDI, + Standard_Integer theNArg, + const char ** theArgVal) +{ + if (theNArg != 5) + { + cout << "Use: " << theArgVal[0] <<" surface curve start end" << endl; + return 1; + } + + + + + + Handle(Geom_Surface) aSurface = DrawTrSurf::GetSurface(theArgVal[1]); + Handle(Geom_Curve) aCurve = DrawTrSurf::GetCurve(theArgVal[2]); + Standard_Real aStart = Draw::Atof(theArgVal[3]); + Standard_Real anEnd = Draw::Atof(theArgVal[4]); + + //project + Handle (Geom2d_Curve) aPCurve; + + ShapeConstruct_ProjectCurveOnSurface aProj; + aProj.Init(aSurface, Precision::Confusion()); + { + try { + Handle (Geom_Curve) aTmpCurve = aCurve; //to use reference in Perform() + aProj.Perform (aTmpCurve, aStart, anEnd, aPCurve); + } catch (const Standard_Failure&) { + } + } + + //check results + if (aPCurve.IsNull()) { + theDI << "Error: pcurve is null\n"; + } + else { + if (aPCurve->IsKind(STANDARD_TYPE(Geom2d_Line))) { + theDI << "Pcurve is line: OK\n"; + } + else { + theDI << "Error: PCurve is not line\n"; + } + } + + return 0; +} void QABugs::Commands_20(Draw_Interpretor& theCommands) { const char *group = "QABugs"; @@ -1523,6 +1578,7 @@ void QABugs::Commands_20(Draw_Interpretor& theCommands) { theCommands.Add ("OCC24836", "OCC24836", __FILE__, OCC24836, group); theCommands.Add("OCC27021", "OCC27021", __FILE__, OCC27021, group); theCommands.Add("OCC27235", "OCC27235", __FILE__, OCC27235, group); + theCommands.Add("OCC26930", "OCC26930", __FILE__, OCC26930, group); return; } diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx index df3f83dc2f..052a95c267 100644 --- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx +++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -556,49 +557,101 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G //! Fix possible period jump and handle walking period parameter. static Standard_Boolean fixPeriodictyTroubles(gp_Pnt2d *thePnt, // pointer to gp_Pnt2d[4] beginning Standard_Integer theIdx, // Index of objective coord: 1 ~ X, 2 ~ Y - Standard_Real thePeriod) // Period on objective coord - { - Standard_Integer i; + Standard_Real thePeriod, // Period on objective coord + Standard_Integer theSavedPoint, // Point number to choose period + Standard_Real theSavedParam) // Param from cashe to choose period +{ + Standard_Real aSavedParam; + Standard_Integer aSavedPoint; + Standard_Real aMinParam = 0.0, aMaxParam = thePeriod; + if (theSavedPoint < 0) { + // normalize to first period by default + aSavedParam = 0.5 * thePeriod; + aSavedPoint = 0; + } + else { + aSavedParam = theSavedParam; + aSavedPoint = theSavedPoint; + while (aMinParam > aSavedParam) { + aMinParam -= thePeriod; + aMaxParam -= thePeriod; + } + while (aMaxParam < aSavedParam) { + aMinParam += thePeriod; + aMaxParam += thePeriod; + } + } - Standard_Boolean isNeedToFix = Standard_True; - for (i = 0; i < 3; i++) - { - Standard_Real aDiff = Abs (thePnt[i].Coord(theIdx) - thePnt[i + 1].Coord(theIdx)); - if ( aDiff > Precision::PConfusion() && - aDiff < thePeriod - Precision::PConfusion()) - { - // Walk over period coord -> not walking on another isoline in parameter space. - isNeedToFix = Standard_False; - } - } + Standard_Real aFixIsoParam = aMinParam; + Standard_Boolean isIsoLine = Standard_False; + if (aMaxParam - aSavedParam < Precision::PConfusion() || + aSavedParam - aMinParam < Precision::PConfusion()) { + aFixIsoParam = aSavedParam; + isIsoLine = Standard_True; + } + // normalize all coordinates to [aMinParam, aMaxParam) + for (Standard_Integer i = 0; i < 4; i++) { + Standard_Real aParam = thePnt[i].Coord(theIdx); + Standard_Real aShift = ShapeAnalysis::AdjustToPeriod(aParam, aMinParam, aMaxParam); + aParam += aShift; + // Walk over period coord -> not walking on another isoline in parameter space. + if (isIsoLine) { + if (aMaxParam - aParam < Precision::PConfusion() || aParam - aMinParam < Precision::PConfusion()) + aParam = aFixIsoParam; + } + else { + if (aMaxParam - aParam < Precision::PConfusion()) + aParam = aMaxParam; + if (aParam - aMinParam < Precision::PConfusion()) + aParam = aMinParam; + } - if (isNeedToFix) - { - // Walking on isoline on another parameter. Fix period paramter to obtained minimum. - Standard_Real aFixParam = Min (thePnt[0].Coord(theIdx), thePnt[3].Coord(theIdx)); - for(i = 0; i < 4; i++) - thePnt[i].SetCoord(theIdx, aFixParam); - } + thePnt[i].SetCoord(theIdx, aParam); + } - // Fix possible period jump on first point. - if ( Abs(thePnt[0].Coord(theIdx) - thePnt[1].Coord(theIdx) ) > thePeriod / 2.01) - { - Standard_Real aMult = thePnt[0].Coord(theIdx) < thePnt[1].Coord(theIdx) ? 1.0 : -1.0; - Standard_Real aNewParam = thePnt[0].Coord(theIdx) + aMult * thePeriod; - thePnt[0].SetCoord(theIdx, aNewParam); - return Standard_False; - } + // find possible period jump and increasing or decreasing coordinates vector + Standard_Boolean isJump = Standard_False; + Standard_Real aPrevDiff = 0.0; + Standard_Real aSumDiff = 1.0; + for (Standard_Integer i = 0; i < 3; i++) { + Standard_Real aDiff = thePnt[i + 1].Coord(theIdx) - thePnt[i].Coord(theIdx); + if (aDiff < -Precision::PConfusion()) { + aSumDiff *= -1.0; + } + //if first derivative changes its sign then period jump may exists in this place + if (aDiff * aPrevDiff < -Precision::PConfusion()) { + isJump = Standard_True; + } + aPrevDiff = aDiff; + } - // Fix possible period jump on last point. - if ( Abs(thePnt[2].Coord(theIdx) - thePnt[3].Coord(theIdx) ) > thePeriod / 2.01) - { - Standard_Real aMult = thePnt[3].Coord(theIdx) < thePnt[2].Coord(theIdx) ? 1.0 : -1.0; - Standard_Real aNewParam = thePnt[3].Coord(theIdx) + aMult * thePeriod; - thePnt[3].SetCoord(theIdx, aNewParam); - return Standard_False; - } + if (!isJump) + return Standard_False; - return Standard_True; + if (aSumDiff > 0) { // decreasing sequence (parameters decrease twice(--) and one period jump(+)) + for (Standard_Integer i = aSavedPoint; i > 0; i--) + if (thePnt[i].Coord(theIdx) > thePnt[i - 1].Coord(theIdx)) { + thePnt[i - 1].SetCoord(theIdx, thePnt[i - 1].Coord(theIdx) + thePeriod); + } + for (Standard_Integer i = aSavedPoint; i < 3; i++) + if (thePnt[i].Coord(theIdx) < thePnt[i + 1].Coord(theIdx)) { + thePnt[i + 1].SetCoord(theIdx, thePnt[i + 1].Coord(theIdx) - thePeriod); + } + } + else {// increasing sequence (parameters increase twice(++) and one period jump(-)) + for (Standard_Integer i = aSavedPoint; i > 0; i--) + if (thePnt[i].Coord(theIdx) < thePnt[i - 1].Coord(theIdx)) { + thePnt[i - 1].SetCoord(theIdx, thePnt[i - 1].Coord(theIdx) - thePeriod); + } + for (Standard_Integer i = aSavedPoint; i < 3; i++) + if (thePnt[i].Coord(theIdx) > thePnt[i + 1].Coord(theIdx)) { + thePnt[i + 1].SetCoord(theIdx, thePnt[i + 1].Coord(theIdx) + thePeriod); + } + } + + // Do not return false, because for nonlinear 2d curves vector of parameters + // may change its first derivative and shifted parameters will be broken for this case. + return Standard_True; } //======================================================================= @@ -611,7 +664,8 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G const TColStd_Array1OfReal& theparams, TColgp_Array1OfPnt2d& thePnt2ds, Standard_Real theTol, - Standard_Boolean &isRecompute) const + Standard_Boolean &isRecompute, + Standard_Boolean &isFromCashe) const { Standard_Integer nb = thepoints.Length(); gp_Pnt aP[4]; @@ -633,7 +687,12 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G theTol = Precision::Confusion(); aTol2 = theTol * theTol; } + if (aTol2 < Precision::SquareConfusion()) + aTol2 = Precision::SquareConfusion(); Standard_Real anOldTol2 = aTol2; + // auxiliary variables to choose period for connection with previous 2dcurve (if exist) + Standard_Integer aSavedPointNum = -1; + gp_Pnt2d aSavedPoint; // project first and last points for( ; i < 4; i +=3) @@ -644,6 +703,10 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G { aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, theTol); + aSavedPointNum = i; + aSavedPoint = myCashe2d[j]; + if (i == 0) + isFromCashe = Standard_True; break; } if ( j >= myNbCashe ) @@ -665,6 +728,8 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G if ( myCashe3d[j].SquareDistance (aP[i] ) < aTol2) { aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, theTol); + aSavedPointNum = i; + aSavedPoint = myCashe2d[j]; break; } if ( j >= myNbCashe ) @@ -678,15 +743,22 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G if (isPeriodicU) { - isRecompute = fixPeriodictyTroubles(&aP2d[0], 1 /* X Coord */, mySurf->Surface()->UPeriod()); + isRecompute = fixPeriodictyTroubles(&aP2d[0], 1 /* X Coord */, mySurf->Surface()->UPeriod(), aSavedPointNum, aSavedPoint.X()); } if (isPeriodicV) { - isRecompute = fixPeriodictyTroubles(&aP2d[0], 2 /* Y Coord */, mySurf->Surface()->VPeriod()); + isRecompute = fixPeriodictyTroubles(&aP2d[0], 2 /* Y Coord */, mySurf->Surface()->VPeriod(), aSavedPointNum, aSavedPoint.Y()); } } + if (isRecompute && mySurf->Surface()->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) { + // Do not try to make line, because in this case may be very special case when 3d curve + // go over the pole of, e.g., sphere, and partly lies along seam + // (see ApproxPCurve() for more information). + return 0; + } + thePnt2ds.SetValue(1, aP2d[0]); thePnt2ds.SetValue(nb, aP2d[3]); @@ -699,17 +771,40 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G return 0; gp_Vec2d aVec0 (aP2d[0], aP2d[3]); gp_Vec2d aVec = aVec0 / dPar; - Standard_Real aFirstPointDist = mySurf->Surface()->Value(aP2d[0].X(), aP2d[0].Y()). - SquareDistance(thepoints(1)); - for(i = 2; i < nb; i++) - { - gp_XY aCurPoint = aP2d[0].XY() + aVec.XY() * (theparams(i) - theparams(1)); - gp_Pnt aCurP; - mySurf->Surface()->D0(aCurPoint.X(), aCurPoint.Y(), aCurP); - Standard_Real aDist1 = aCurP.SquareDistance(thepoints(i)); - - if(Abs (aFirstPointDist - aDist1) > aTol2) - return 0; + Handle(Geom_Surface) aSurf = mySurf->Surface(); + Standard_Boolean isNormalCheck = aSurf->IsCNu(1) && aSurf->IsCNv(1); + if (isNormalCheck) { + for(i = 1; i <= nb; i++) + { + gp_XY aCurPoint = aP2d[0].XY() + aVec.XY() * (theparams(i) - theparams(1)); + gp_Pnt aCurP; + gp_Vec aNormalVec, aDu, aDv; + aSurf->D1(aCurPoint.X(), aCurPoint.Y(), aCurP, aDu, aDv); + aNormalVec = aDu ^ aDv; + if (aNormalVec.SquareMagnitude() < Precision::SquareConfusion()) { + isNormalCheck = Standard_False; + break; + } + gp_Lin aNormalLine(aCurP, gp_Dir(aNormalVec)); + Standard_Real aDist = aNormalLine.Distance(thepoints(i)); + if (aDist > theTol) + return 0; + } + } + if (!isNormalCheck) { + Standard_Real aFirstPointDist = mySurf->Surface()->Value(aP2d[0].X(), aP2d[0].Y()). + SquareDistance(thepoints(1)); + aTol2 = Max(aTol2, aTol2 * 2 * aFirstPointDist); + for(i = 2; i < nb; i++) + { + gp_XY aCurPoint = aP2d[0].XY() + aVec.XY() * (theparams(i) - theparams(1)); + gp_Pnt aCurP; + aSurf->D0(aCurPoint.X(), aCurPoint.Y(), aCurP); + Standard_Real aDist1 = aCurP.SquareDistance(thepoints(i)); + + if(Abs (aFirstPointDist - aDist1) > aTol2) + return 0; + } } // check if pcurve can be represented by Geom2d_Line (parameterised by length) @@ -752,9 +847,28 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G { // for performance, first try to handle typical case when pcurve is straight Standard_Boolean isRecompute = Standard_False; - c2d = getLine(points, params, pnt2d, myPreci, isRecompute); + Standard_Boolean isFromCasheLine = Standard_False; + c2d = getLine(points, params, pnt2d, myPreci, isRecompute, isFromCasheLine); if(!c2d.IsNull()) { + // fill cashe + Standard_Boolean ChangeCycle = Standard_False; + if(myNbCashe>0 && myCashe3d[0].Distance(points(1)) > myCashe3d[0].Distance(points(nbrPnt)) && + myCashe3d[0].Distance(points(nbrPnt))0 && myCashe3d[0].Distance(points(1))>myCashe3d[0].Distance(points(nbrPnt)) ) //if(myCashe3d[0].Distance(points(nbrPnt))Gap(); + if (i == 1) { + isFromCashe = isFromCasheLine; + aSavedPoint = p2d; + } continue; } else @@ -928,6 +1049,10 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G { p2d = mySurf->NextValueOfUV (myCashe2d[j], p3d, myPreci, Precision::Confusion()+gap); + if (i == 1) { + isFromCashe = Standard_True; + aSavedPoint = myCashe2d[j]; + } break; } if ( j >= myNbCashe ) p2d = mySurf->ValueOfUV(p3d, myPreci); @@ -979,8 +1104,26 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G if (mySurf->IsUClosed(myPreci)) {//#78 rln 12.03.99 S4135 // Premier point dans le domain [uf, ul] Standard_Real prevX, firstX = pnt2d (1).X(); - while (firstX < uf) { firstX += Up; pnt2d (1).SetX(firstX); } - while (firstX > ul) { firstX -= Up; pnt2d (1).SetX(firstX); } + if (!isFromCashe) { + // do not shift 2dcurve, if it connects to previous + while (firstX < uf) { firstX += Up; pnt2d (1).SetX(firstX); } + while (firstX > ul) { firstX -= Up; pnt2d (1).SetX(firstX); } + } + // shift first point, according to cashe + if (mySurf->Surface()->IsUPeriodic() && isFromCashe) { + Standard_Real aMinParam = uf, aMaxParam = ul; + while (aMinParam > aSavedPoint.X()) { + aMinParam -= Up; + aMaxParam -= Up; + } + while (aMaxParam < aSavedPoint.X()) { + aMinParam += Up; + aMaxParam += Up; + } + Standard_Real aShift = ShapeAnalysis::AdjustToPeriod(firstX, aMinParam, aMaxParam); + firstX += aShift; + pnt2d(1).SetX(firstX); + } prevX = firstX; //:97 abv 1 Feb 98: treat case when curve is whole out of surface bounds @@ -1005,12 +1148,15 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G } //:97 - Standard_Real midX = 0.5 * ( minX + maxX ); - Standard_Real shiftX=0.; - if ( midX > ul ) shiftX = -Up; - else if ( midX < uf ) shiftX = Up; - if ( shiftX != 0. ) - for ( i=1; i <= nbrPnt; i++ ) pnt2d(i).SetX ( pnt2d(i).X() + shiftX ); + if (!isFromCashe) { + // do not shift 2dcurve, if it connects to previous + Standard_Real midX = 0.5 * ( minX + maxX ); + Standard_Real shiftX=0.; + if ( midX > ul ) shiftX = -Up; + else if ( midX < uf ) shiftX = Up; + if ( shiftX != 0. ) + for ( i=1; i <= nbrPnt; i++ ) pnt2d(i).SetX ( pnt2d(i).X() + shiftX ); + } } // Si la surface est VCLosed, on recadre les points // Same code as UClosed : optimisation souhaitable !! @@ -1022,8 +1168,26 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G if (mySurf->IsVClosed(myPreci) || mySurf->Surface()->IsKind (STANDARD_TYPE (Geom_SphericalSurface))) { // Premier point dans le domain [vf, vl] Standard_Real prevY, firstY = pnt2d (1).Y(); - while (firstY < vf) { firstY += Vp; pnt2d (1).SetY(firstY); } - while (firstY > vl) { firstY -= Vp; pnt2d (1).SetY(firstY); } + if (!isFromCashe) { + // do not shift 2dcurve, if it connects to previous + while (firstY < vf) { firstY += Vp; pnt2d (1).SetY(firstY); } + while (firstY > vl) { firstY -= Vp; pnt2d (1).SetY(firstY); } + } + // shift first point, according to cashe + if (mySurf->Surface()->IsVPeriodic() && isFromCashe) { + Standard_Real aMinParam = vf, aMaxParam = vl; + while (aMinParam > aSavedPoint.Y()) { + aMinParam -= Vp; + aMaxParam -= Vp; + } + while (aMaxParam < aSavedPoint.Y()) { + aMinParam += Vp; + aMaxParam += Vp; + } + Standard_Real aShift = ShapeAnalysis::AdjustToPeriod(firstY, aMinParam, aMaxParam); + firstY += aShift; + pnt2d(1).SetY(firstY); + } prevY = firstY; //:97 abv 1 Feb 98: treat case when curve is whole out of surface bounds @@ -1047,12 +1211,15 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G } //:97 - Standard_Real midY = 0.5 * ( minY + maxY ); - Standard_Real shiftY=0.; - if ( midY > vl ) shiftY = -Vp; - else if ( midY < vf ) shiftY = Vp; - if ( shiftY != 0. ) - for ( i=1; i <= nbrPnt; i++ ) pnt2d(i).SetY ( pnt2d(i).Y() + shiftY ); + if (!isFromCashe) { + // do not shift 2dcurve, if it connects to previous + Standard_Real midY = 0.5 * ( minY + maxY ); + Standard_Real shiftY=0.; + if ( midY > vl ) shiftY = -Vp; + else if ( midY < vf ) shiftY = Vp; + if ( shiftY != 0. ) + for ( i=1; i <= nbrPnt; i++ ) pnt2d(i).SetY ( pnt2d(i).Y() + shiftY ); + } } //#69 rln 01.03.99 S4135 bm2_sd_t4-A.stp entity 30 diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx index c28f8ceeaf..749c13f779 100644 --- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx +++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx @@ -147,7 +147,7 @@ protected: //! points2d - 2d points lies on line in parametric space //! theTol - tolerance used for compare initial points 3d and //! 3d points obtained from line lying in parameric space of surface - Standard_EXPORT Handle(Geom2d_Curve) getLine (const TColgp_Array1OfPnt& points, const TColStd_Array1OfReal& params, TColgp_Array1OfPnt2d& points2d, const Standard_Real theTol, Standard_Boolean& IsRecompute) const; + Standard_EXPORT Handle(Geom2d_Curve) getLine (const TColgp_Array1OfPnt& points, const TColStd_Array1OfReal& params, TColgp_Array1OfPnt2d& points2d, const Standard_Real theTol, Standard_Boolean& IsRecompute, Standard_Boolean &isFromCashe) const; Handle(ShapeAnalysis_Surface) mySurf; Standard_Real myPreci; diff --git a/tests/bugs/heal/bug26930_1 b/tests/bugs/heal/bug26930_1 new file mode 100644 index 0000000000..a0c4974bc6 --- /dev/null +++ b/tests/bugs/heal/bug26930_1 @@ -0,0 +1,14 @@ +puts "========" +puts "OCC26930" +puts "========" +puts "" +################################################################################# +# ShapeConstruct_ProjectCurveOnSurface returns a B-Spline instead of line (again) +################################################################################# + +pload QAcommands + +restore [locate_data_file bug26930_surf_1.draw] s +restore [locate_data_file bug26930_curv_1.draw] c + +OCC26930 s c 0.0 14.3316 diff --git a/tests/bugs/heal/bug26930_2 b/tests/bugs/heal/bug26930_2 new file mode 100644 index 0000000000..b308748893 --- /dev/null +++ b/tests/bugs/heal/bug26930_2 @@ -0,0 +1,14 @@ +puts "========" +puts "OCC26930" +puts "========" +puts "" +################################################################################# +# ShapeConstruct_ProjectCurveOnSurface returns a B-Spline instead of line (again) +################################################################################# + +pload QAcommands + +restore [locate_data_file bug26930_surf_2.draw] s +restore [locate_data_file bug26930_curv_2.draw] c + +OCC26930 s c 0.0 12.41152967687705 diff --git a/tests/de/iges_1/J3 b/tests/de/iges_1/J3 index 9b24bb29bd..e14032bde6 100644 --- a/tests/de/iges_1/J3 +++ b/tests/de/iges_1/J3 @@ -1,16 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR25013 ALL: Error : 1 differences with reference data found" + set filename CTS18546-2.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 42 ( 1091 ) Summary = 42 ( 1091 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 54 ( 1095 ) Summary = 54 ( 1095 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) 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 ) +TOLERANCE : MaxTol = 0.5433123157 ( 0.8329982221 ) AvgTol = 0.002232604726 ( 0.002439058312 ) LABELS : N0Labels = 1038 ( 1038 ) N1Labels = 0 ( 1537 ) N2Labels = 0 ( 0 ) TotalLabels = 1038 ( 2575 ) NameLabels = 1038 ( 1038 ) ColorLabels = 1038 ( 2575 ) LayerLabels = 1038 ( 2575 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/iges_1/K3 b/tests/de/iges_1/K3 index 6d4f9a5d0a..f065dbf16a 100644 --- a/tests/de/iges_1/K3 +++ b/tests/de/iges_1/K3 @@ -1,17 +1,17 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" -puts "TODO CR23096 ALL: Error : 2 differences with reference data found" +puts "TODO CR23096 ALL: LABELS : Faulty" + set filename FRA62468-1.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 299 ( 5226 ) Summary = 299 ( 5226 ) -CHECKSHAPE : Wires = 12 ( 20 ) Faces = 16 ( 18 ) Shells = 0 ( 0 ) Solids = 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 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 345 ( 5241 ) Summary = 345 ( 5241 ) +CHECKSHAPE : Wires = 8 ( 12 ) Faces = 12 ( 12 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) Summary = 68372 ( 68420 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) FreeWire = 10 ( 10 ) FreeEdge = 283 ( 283 ) SharedEdge = 29053 ( 29079 ) +TOLERANCE : MaxTol = 0.9874083984 ( 0.9875071265 ) AvgTol = 0.01115263424 ( 0.01115875402 ) LABELS : N0Labels = 5392 ( 5458 ) N1Labels = 18 ( 4483 ) N2Labels = 0 ( 0 ) TotalLabels = 5410 ( 9941 ) NameLabels = 5392 ( 5458 ) ColorLabels = 5391 ( 9875 ) LayerLabels = 5391 ( 9875 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) diff --git a/tests/de/iges_1/L1 b/tests/de/iges_1/L1 index 9d9ba8bb33..3abe068421 100644 --- a/tests/de/iges_1/L1 +++ b/tests/de/iges_1/L1 @@ -8,9 +8,9 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 1 ) Summary = 0 ( 1 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 94 ) Summary = 0 ( 94 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 90 ( 90 ) Summary = 1157 ( 1151 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 90 ( 90 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 498 ( 492 ) -TOLERANCE : MaxTol = 0.0004488403826 ( 0.0004487950678 ) AvgTol = 5.999008312e-006 ( 6.427182608e-006 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 90 ( 90 ) Summary = 1141 ( 1135 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 90 ( 90 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 482 ( 476 ) +TOLERANCE : MaxTol = 0.0004488397396 ( 0.0004487950678 ) AvgTol = 6.030364624e-006 ( 6.02982047e-006 ) LABELS : N0Labels = 3 ( 6 ) N1Labels = 90 ( 90 ) N2Labels = 0 ( 0 ) TotalLabels = 93 ( 96 ) NameLabels = 3 ( 6 ) ColorLabels = 90 ( 90 ) LayerLabels = 0 ( 0 ) 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 index d1e0c36ece..7ca2785aa8 100755 --- a/tests/de/iges_1/O5 +++ b/tests/de/iges_1/O5 @@ -1,15 +1,13 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR25013 ALL: Error : 2 differences with reference data found" - set filename lh93wsddr3370z2.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 246 ( 6306 ) Summary = 246 ( 6306 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 252 ( 6395 ) Summary = 252 ( 6395 ) 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 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 685 ( 685 ) Summary = 10611 ( 10601 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 685 ( 685 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 4640 ( 4635 ) +TOLERANCE : MaxTol = 0.03464832644 ( 0.08716146716 ) AvgTol = 0.0001786183361 ( 0.0002065396413 ) 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/P5 b/tests/de/iges_1/P5 index 885ad8a3e8..5574866b47 100755 --- a/tests/de/iges_1/P5 +++ b/tests/de/iges_1/P5 @@ -6,7 +6,7 @@ set filename brazo1.igs set ref_data { DATA : Faulties = 0 ( 2 ) Warnings = 0 ( 0 ) Summary = 0 ( 2 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 139 ( 454 ) Summary = 139 ( 454 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 150 ( 480 ) Summary = 150 ( 480 ) CHECKSHAPE : Wires = 6 ( 8 ) Faces = 6 ( 8 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) Summary = 4584 ( 4544 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2084 ( 2076 ) diff --git a/tests/de/iges_2/A4 b/tests/de/iges_2/A4 index bc1a5328c7..82811fae18 100644 --- a/tests/de/iges_2/A4 +++ b/tests/de/iges_2/A4 @@ -1,17 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR25013 ALL: Error : 2 differences with reference data found" set LinuxDiff 1 set filename pro5101.igs set ref_data { DATA : Faulties = 0 ( 1 ) Warnings = 0 ( 1 ) Summary = 0 ( 2 ) -TPSTAT : Faulties = 0 ( 9 ) Warnings = 110 ( 1040 ) Summary = 110 ( 1049 ) +TPSTAT : Faulties = 0 ( 9 ) Warnings = 110 ( 1087 ) Summary = 110 ( 1096 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -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 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 622 ( 312 ) Summary = 23710 ( 11837 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 622 ( 622 ) FreeWire = 816 ( 816 ) FreeEdge = 4824 ( 4824 ) SharedEdge = 10126 ( 5053 ) +TOLERANCE : MaxTol = 0.6427268663 ( 4.45211637 ) AvgTol = 0.01239718254 ( 0.01385833784 ) LABELS : N0Labels = 7 ( 7 ) N1Labels = 379 ( 3264 ) N2Labels = 0 ( 0 ) TotalLabels = 386 ( 3271 ) NameLabels = 386 ( 1010 ) ColorLabels = 381 ( 3266 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/iges_2/A8 b/tests/de/iges_2/A8 index f15eaa5cc5..71cb6f87f5 100644 --- a/tests/de/iges_2/A8 +++ b/tests/de/iges_2/A8 @@ -1,18 +1,17 @@ # !!!! 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 CR25013 ALL: Error : 2 differences with reference data found" set filename kegel.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 25 ( 330 ) Summary = 25 ( 330 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 25 ( 339 ) Summary = 25 ( 339 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 157 ( 157 ) Summary = 3724 ( 3723 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 157 ( 157 ) FreeWire = 34 ( 34 ) FreeEdge = 473 ( 473 ) SharedEdge = 1477 ( 1477 ) -TOLERANCE : MaxTol = 0.9504514132 ( 1.074871981 ) AvgTol = 0.0174083983 ( 0.01757881129 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 157 ( 157 ) Summary = 3724 ( 3721 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 157 ( 157 ) FreeWire = 34 ( 34 ) FreeEdge = 473 ( 473 ) SharedEdge = 1477 ( 1476 ) +TOLERANCE : MaxTol = 0.9504514132 ( 1.074871981 ) AvgTol = 0.01740837291 ( 0.01759673602 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 545 ( 1285 ) N2Labels = 0 ( 0 ) TotalLabels = 546 ( 1286 ) NameLabels = 546 ( 645 ) ColorLabels = 545 ( 1285 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1 index e3c6b4dfa1..f26769f244 100755 --- a/tests/de/iges_2/B1 +++ b/tests/de/iges_2/B1 @@ -2,19 +2,18 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: LAYERS : Faulty" -puts "TODO CR25013 ALL: Error : 3 differences with reference data found" set filename CATIA01.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 480 ) Warnings = 322 ( 4629 ) Summary = 322 ( 5109 ) -CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) Summary = 60876 ( 60888 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) FreeWire = 1612 ( 1613 ) FreeEdge = 16359 ( 16359 ) SharedEdge = 22927 ( 22933 ) -TOLERANCE : MaxTol = 0.6032674714 ( 0.6032674714 ) AvgTol = 0.001483351096 ( 0.00148733059 ) -LABELS : N0Labels = 4 ( 7 ) N1Labels = 11017 ( 17868 ) N2Labels = 0 ( 0 ) TotalLabels = 11021 ( 17875 ) NameLabels = 10620 ( 13085 ) ColorLabels = 11018 ( 17867 ) LayerLabels = 10517 ( 17715 ) +TPSTAT : Faulties = 0 ( 480 ) Warnings = 321 ( 4694 ) Summary = 321 ( 5174 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) Summary = 60874 ( 60886 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) FreeWire = 1612 ( 1613 ) FreeEdge = 16359 ( 16359 ) SharedEdge = 22926 ( 22932 ) +TOLERANCE : MaxTol = 0.6032674714 ( 0.6032674714 ) AvgTol = 0.001484584897 ( 0.001489801723 ) +LABELS : N0Labels = 4 ( 7 ) N1Labels = 11017 ( 18087 ) N2Labels = 0 ( 0 ) TotalLabels = 11021 ( 18094 ) NameLabels = 10620 ( 13085 ) ColorLabels = 11018 ( 18086 ) LayerLabels = 10517 ( 17934 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 17 ( 17 ) COLORS : Colors = BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ( BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ) diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8 index 8fa081c782..1f3091a2b7 100644 --- a/tests/de/iges_2/B8 +++ b/tests/de/iges_2/B8 @@ -1,19 +1,18 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" -puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" -puts "TODO CR23096 ALL: Error : 2 differences with reference data found" +puts "TODO CR23096 ALL: LABELS : Faulty" set LinuxDiff 1 set filename FRA62468-2.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 253 ( 4993 ) Summary = 253 ( 4993 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 293 ( 5002 ) Summary = 293 ( 5002 ) CHECKSHAPE : Wires = 8 ( 11 ) Faces = 8 ( 7 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -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 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) Summary = 63108 ( 63146 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) FreeWire = 18 ( 18 ) FreeEdge = 452 ( 452 ) SharedEdge = 26776 ( 26797 ) +TOLERANCE : MaxTol = 0.9804479161 ( 0.9805459497 ) AvgTol = 0.01154142976 ( 0.0115517576 ) LABELS : N0Labels = 5089 ( 5165 ) N1Labels = 26 ( 3878 ) N2Labels = 0 ( 0 ) TotalLabels = 5115 ( 9043 ) NameLabels = 5089 ( 5165 ) ColorLabels = 5086 ( 8967 ) LayerLabels = 5086 ( 8967 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) diff --git a/tests/de/iges_2/C2 b/tests/de/iges_2/C2 index c3cdd97e6b..429a1c052e 100644 --- a/tests/de/iges_2/C2 +++ b/tests/de/iges_2/C2 @@ -3,17 +3,17 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR23096 ALL: Error : 3 differences with reference data found" + set filename PRO10626.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 2 ( 0 ) Warnings = 85 ( 295 ) Summary = 87 ( 295 ) -CHECKSHAPE : Wires = 8 ( 13 ) Faces = 8 ( 13 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) Summary = 5328 ( 5349 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) FreeWire = 4 ( 4 ) FreeEdge = 42 ( 42 ) SharedEdge = 2220 ( 2226 ) -TOLERANCE : MaxTol = 4.547932063 ( 4.543567878 ) AvgTol = 0.03466358537 ( 0.03659099671 ) +TPSTAT : Faulties = 2 ( 0 ) Warnings = 91 ( 292 ) Summary = 93 ( 292 ) +CHECKSHAPE : Wires = 8 ( 15 ) Faces = 8 ( 13 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) Summary = 5338 ( 5360 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) FreeWire = 4 ( 4 ) FreeEdge = 42 ( 42 ) SharedEdge = 2224 ( 2230 ) +TOLERANCE : MaxTol = 4.548618897 ( 4.543567878 ) AvgTol = 0.03326799149 ( 0.03597535474 ) LABELS : N0Labels = 457 ( 457 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 457 ) NameLabels = 457 ( 457 ) ColorLabels = 451 ( 455 ) LayerLabels = 453 ( 457 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/iges_2/C4 b/tests/de/iges_2/C4 index d6f43c74ca..765b447881 100644 --- a/tests/de/iges_2/C4 +++ b/tests/de/iges_2/C4 @@ -1,19 +1,19 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR23096 ALL: TOLERANCE : Faulty" +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" -puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" +puts "TODO CR23096 ALL: TOLERANCE : Faulty" +puts "TODO CR23096 ALL: LABELS : Faulty" set LinuxDiff 1 set filename PRO14323.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 29 ( 233 ) Summary = 29 ( 233 ) -CHECKSHAPE : Wires = 1 ( 1 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 32 ( 319 ) Summary = 32 ( 319 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 153 ( 153 ) Summary = 3497 ( 3504 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 153 ( 153 ) FreeWire = 21 ( 21 ) FreeEdge = 435 ( 435 ) SharedEdge = 1380 ( 1384 ) -TOLERANCE : MaxTol = 0.9672552763 ( 0.9530871146 ) AvgTol = 0.01866948774 ( 0.01940759381 ) +TOLERANCE : MaxTol = 0.9672552763 ( 0.776676229 ) AvgTol = 0.01571417252 ( 0.01646993877 ) LABELS : N0Labels = 564 ( 564 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 564 ( 564 ) NameLabels = 564 ( 564 ) ColorLabels = 543 ( 564 ) LayerLabels = 543 ( 564 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/iges_2/D9 b/tests/de/iges_2/D9 index f765bd0e1d..6dab5af887 100644 --- a/tests/de/iges_2/D9 +++ b/tests/de/iges_2/D9 @@ -1,18 +1,17 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR25013 ALL: Error : 2 differences with reference data found" set filename bmarkmdl.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 121 ( 4199 ) Summary = 121 ( 4199 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 127 ( 4244 ) Summary = 127 ( 4244 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 440 ( 440 ) Summary = 9077 ( 9077 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 440 ( 440 ) FreeWire = 20 ( 20 ) FreeEdge = 220 ( 220 ) SharedEdge = 4083 ( 4083 ) -TOLERANCE : MaxTol = 0.07954526757 ( 0.04419037521 ) AvgTol = 0.0008428584881 ( 0.0007103047948 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 440 ( 440 ) Summary = 9081 ( 9077 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 440 ( 440 ) FreeWire = 20 ( 20 ) FreeEdge = 220 ( 220 ) SharedEdge = 4085 ( 4083 ) +TOLERANCE : MaxTol = 0.07954526757 ( 0.04419037521 ) AvgTol = 0.0008416415594 ( 0.000715264452 ) LABELS : N0Labels = 47 ( 47 ) N1Labels = 426 ( 426 ) N2Labels = 0 ( 0 ) TotalLabels = 473 ( 473 ) NameLabels = 473 ( 473 ) ColorLabels = 439 ( 439 ) LayerLabels = 452 ( 472 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) diff --git a/tests/de/iges_2/E3 b/tests/de/iges_2/E3 index e5969c0b80..feb593d57b 100644 --- a/tests/de/iges_2/E3 +++ b/tests/de/iges_2/E3 @@ -1,18 +1,17 @@ # !!!! 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 CR25013 ALL: Error : 1 differences with reference data found" set filename cts17801.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 4 ( 374 ) Summary = 4 ( 374 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 419 ) Summary = 8 ( 419 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) 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 ) +TOLERANCE : MaxTol = 0.08196317057 ( 0.08606507237 ) AvgTol = 0.003600650205 ( 0.004429029469 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 1233 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 1234 ) NameLabels = 215 ( 311 ) ColorLabels = 214 ( 1233 ) LayerLabels = 214 ( 1233 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1 index 98dc07148c..eebb4afdd2 100755 --- a/tests/de/iges_2/G1 +++ b/tests/de/iges_2/G1 @@ -2,8 +2,6 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -#puts "TODO CR23096 ALL: STATSHAPE : Faulty " -#puts "TODO CR23096 ALL: Error : 2 differences with reference data found :" set LinuxDiff 2 set LinuxFaulties {STATSHAPE} @@ -11,11 +9,11 @@ set filename Henri.igs 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 ( 71753 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44964 ( 28785 ) -TOLERANCE : MaxTol = 0.9133007093 ( 0.9133008813 ) AvgTol = 0.005629101837 ( 0.005904201197 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 78 ( 54 ) Summary = 78 ( 54 ) +CHECKSHAPE : Wires = 11 ( 3 ) Faces = 11 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 2312 ) Summary = 112063 ( 71734 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44967 ( 28774 ) +TOLERANCE : MaxTol = 0.9133007093 ( 0.9133008813 ) AvgTol = 0.005659495327 ( 0.005903880786 ) 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 ) NCOLORS : NColors = 6 ( 6 ) diff --git a/tests/de/iges_2/G7 b/tests/de/iges_2/G7 index 3308375cd8..a5a86ff462 100644 --- a/tests/de/iges_2/G7 +++ b/tests/de/iges_2/G7 @@ -3,19 +3,18 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" -puts "TODO CR25013 ALL: Error : 3 differences with reference data found" set filename PRO18777-3.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 75 ( 1414 ) Summary = 75 ( 1414 ) -CHECKSHAPE : Wires = 1 ( 0 ) Faces = 2 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1568 ( 1568 ) Summary = 19289 ( 19302 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1568 ( 1568 ) FreeWire = 0 ( 14 ) FreeEdge = 28 ( 28 ) SharedEdge = 8150 ( 8149 ) -TOLERANCE : MaxTol = 0.9978911708 ( 0.9978911666 ) AvgTol = 0.01219320525 ( 0.0121152761 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 1596 ( 5152 ) N2Labels = 0 ( 0 ) TotalLabels = 1597 ( 5153 ) NameLabels = 1597 ( 2712 ) ColorLabels = 1596 ( 5152 ) LayerLabels = 1596 ( 5152 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 83 ( 1468 ) Summary = 83 ( 1468 ) +CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1568 ( 1568 ) Summary = 19278 ( 19295 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1568 ( 1568 ) FreeWire = 0 ( 14 ) FreeEdge = 28 ( 28 ) SharedEdge = 8144 ( 8146 ) +TOLERANCE : MaxTol = 0.9978911708 ( 0.9978911666 ) AvgTol = 0.01211223258 ( 0.01212850169 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 1596 ( 5183 ) N2Labels = 0 ( 0 ) TotalLabels = 1597 ( 5184 ) NameLabels = 1597 ( 2711 ) ColorLabels = 1596 ( 5183 ) LayerLabels = 1596 ( 5183 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 7 ) COLORS : Colors = BLUE1 WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_2/I3 b/tests/de/iges_2/I3 index ea54f69d3e..4ad67c776b 100644 --- a/tests/de/iges_2/I3 +++ b/tests/de/iges_2/I3 @@ -1,5 +1,6 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: NBSHAPES : Faulty" +puts "TODO CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" puts "TODO CR23096 ALL: LAYERS : Faulty" @@ -8,12 +9,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty" set filename ims002.igs set ref_data { -DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 20 ( 257 ) Summary = 20 ( 257 ) +DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 413 ) Summary = 0 ( 413 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 19 ( 268 ) Summary = 19 ( 268 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) 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 ) +TOLERANCE : MaxTol = 0.2587117061 ( 0.2578045038 ) AvgTol = 0.001366431787 ( 0.00165305646 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 880 ( 1545 ) N2Labels = 0 ( 0 ) TotalLabels = 881 ( 1546 ) NameLabels = 881 ( 1008 ) ColorLabels = 880 ( 1545 ) LayerLabels = 858 ( 1518 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 7 ) diff --git a/tests/de/iges_2/I9 b/tests/de/iges_2/I9 index 9446c01c0d..5cc55a9bd0 100644 --- a/tests/de/iges_2/I9 +++ b/tests/de/iges_2/I9 @@ -4,18 +4,17 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" puts "TODO CR23096 ALL: LAYERS : Faulty" -puts "TODO CR25013 ALL: Error : 1 differences with reference data found" set filename BUC60215.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 201 ) Warnings = 12 ( 487 ) Summary = 12 ( 688 ) +TPSTAT : Faulties = 0 ( 201 ) Warnings = 12 ( 506 ) Summary = 12 ( 707 ) CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) 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 ) +TOLERANCE : MaxTol = 0.7859817704 ( 0.7859817704 ) AvgTol = 0.005734028784 ( 0.006595335419 ) LABELS : N0Labels = 2 ( 2 ) N1Labels = 2639 ( 3369 ) N2Labels = 0 ( 0 ) TotalLabels = 2641 ( 3371 ) NameLabels = 2641 ( 2850 ) ColorLabels = 2639 ( 3369 ) LayerLabels = 2607 ( 3332 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 9 ) diff --git a/tests/de/step_1/C3 b/tests/de/step_1/C3 index 36863c082c..958faf4e1d 100644 --- a/tests/de/step_1/C3 +++ b/tests/de/step_1/C3 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" set filename trj10_b2-id-214.stp @@ -9,7 +10,7 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 1 ) Summary = 0 ( 1 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 221 ( 221 ) Summary = 1398 ( 1397 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 221 ( 221 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 576 ( 576 ) -TOLERANCE : MaxTol = 0.009952224089 ( 0.009952224089 ) AvgTol = 0.0007250477715 ( 0.000901206859 ) +TOLERANCE : MaxTol = 0.009952224089 ( 0.009952224089 ) AvgTol = 0.0007250463199 ( 0.0009232454653 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_1/J6 b/tests/de/step_1/J6 index ff12ff4bb4..84752d8e14 100755 --- a/tests/de/step_1/J6 +++ b/tests/de/step_1/J6 @@ -1,6 +1,6 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR25013 ALL: Error : 3 differences with reference data found" -puts "TODO CR25013 ALL: NBSHAPES : Faulty" +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" +puts "TODO CR23096 ALL: NBSHAPES : Faulty" set LinuxDiff 2 set LinuxFaulties {STATSHAPE} @@ -8,11 +8,11 @@ set filename bm1_pe_t4.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 2 ) Warnings = 19 ( 27 ) Summary = 19 ( 29 ) -CHECKSHAPE : Wires = 2 ( 3 ) Faces = 3 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) Summary = 149 ( 149 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 57 ( 58 ) -TOLERANCE : MaxTol = 1562.051497 ( 1562.051497 ) AvgTol = 192.5735494 ( 206.7634854 ) +TPSTAT : Faulties = 0 ( 2 ) Warnings = 14 ( 28 ) Summary = 14 ( 30 ) +CHECKSHAPE : Wires = 3 ( 2 ) Faces = 3 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) Summary = 142 ( 143 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 12 ( 12 ) Face = 15 ( 15 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 53 ( 51 ) +TOLERANCE : MaxTol = 1562.051497 ( 1562.051497 ) AvgTol = 273.5183373 ( 208.7393976 ) 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/step_1/L7 b/tests/de/step_1/L7 index 96552440c4..ba65c60202 100644 --- a/tests/de/step_1/L7 +++ b/tests/de/step_1/L7 @@ -3,11 +3,11 @@ set filename bm2_ie_t4-B.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 1 ) Summary = 0 ( 1 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 15 ( 15 ) Face = 16 ( 16 ) Summary = 173 ( 173 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 15 ( 15 ) Face = 16 ( 16 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 62 ( 62 ) -TOLERANCE : MaxTol = 0.009569158984 ( 0.009569158985 ) AvgTol = 0.002156301466 ( 0.002156301479 ) +TOLERANCE : MaxTol = 0.009569158984 ( 0.01011908563 ) AvgTol = 0.002159745049 ( 0.002293336642 ) 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/step_1/ZC6 b/tests/de/step_1/ZC6 index e70bee1c40..2e42321a7b 100644 --- a/tests/de/step_1/ZC6 +++ b/tests/de/step_1/ZC6 @@ -3,11 +3,11 @@ set filename bm2_sy_exhaust-A.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 22 ) Summary = 0 ( 22 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 4 ( 22 ) Summary = 4 ( 22 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 40 ( 40 ) Summary = 214 ( 214 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 40 ( 40 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 76 ( 76 ) -TOLERANCE : MaxTol = 8.89741187e-006 ( 1e-005 ) AvgTol = 1.595321488e-006 ( 4.970162944e-006 ) +TOLERANCE : MaxTol = 0.0003375413377 ( 0.0003395994881 ) AvgTol = 9.487010712e-006 ( 2.324102149e-005 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_1/ZJ7 b/tests/de/step_1/ZJ7 index e905630e20..fe80b1789b 100644 --- a/tests/de/step_1/ZJ7 +++ b/tests/de/step_1/ZJ7 @@ -4,7 +4,7 @@ set filename bm1_pe_fuel.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 8 ) Summary = 8 ( 8 ) -CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +CHECKSHAPE : Wires = 2 ( 2 ) Faces = 2 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 10 ( 10 ) Summary = 89 ( 89 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 10 ( 10 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 34 ( 34 ) TOLERANCE : MaxTol = 112.7632273 ( 112.7632273 ) AvgTol = 20.07582429 ( 20.07582429 ) diff --git a/tests/de/step_1/ZQ2 b/tests/de/step_1/ZQ2 index fa5c03ce05..bdf9086417 100644 --- a/tests/de/step_1/ZQ2 +++ b/tests/de/step_1/ZQ2 @@ -1,6 +1,3 @@ -#puts "TODO OCC25848 Windows: LABELS : Faulty" -#puts "TODO OCC25848 Windows: Error : 1 differences with reference data found" - # !!!! This file is generated automatically, do not edit manually! See end script set filename trj12_gd1-id-214.stp @@ -10,7 +7,7 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 1 ( 1 ) Summary = 1 ( 1 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 7 ( 7 ) Summary = 43 ( 43 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 7 ( 7 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 15 ( 15 ) -TOLERANCE : MaxTol = 1e-07 ( 1e-07 ) AvgTol = 1e-07 ( 1e-07 ) +TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 7 ( 7 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/step_2/B4 b/tests/de/step_2/B4 index ffb575af80..4910cffa31 100644 --- a/tests/de/step_2/B4 +++ b/tests/de/step_2/B4 @@ -1,7 +1,8 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" - +set LinuxDiff 2 +set LinuxFaulties {STATSHAPE} set filename trj12_b3-tu-203.stp set ref_data { @@ -10,7 +11,7 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 67 ) Summary = 0 ( 67 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 696 ( 696 ) Summary = 6794 ( 6252 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 696 ( 696 ) FreeWire = 0 ( 0 ) FreeEdge = 541 ( 541 ) SharedEdge = 2479 ( 2479 ) -TOLERANCE : MaxTol = 0.03072519149 ( 0.3955576531 ) AvgTol = 0.001220761433 ( 0.003949950917 ) +TOLERANCE : MaxTol = 0.03072519149 ( 0.3955576531 ) AvgTol = 0.001233521803 ( 0.00408912606 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 543 ( 548 ) N2Labels = 0 ( 0 ) TotalLabels = 546 ( 551 ) NameLabels = 5 ( 5 ) ColorLabels = 542 ( 394 ) LayerLabels = 542 ( 547 ) PROPS : Centroid = 2 ( 2 ) Volume = 2 ( 2 ) Area = 2 ( 2 ) NCOLORS : NColors = 9 ( 9 ) diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7 index 4726f81efe..b07d5d5e0b 100644 --- a/tests/de/step_2/E7 +++ b/tests/de/step_2/E7 @@ -1,17 +1,17 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" +puts "TODO CR23096 ALL: LABELS : Faulty" set LinuxDiff 3 set filename r76sy.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 1 ( 4 ) Warnings = 68 ( 103 ) Summary = 69 ( 107 ) -CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 23 ( 23 ) Shell = 47 ( 47 ) Face = 194 ( 194 ) Summary = 1350 ( 1357 ) -STATSHAPE : Solid = 23 ( 23 ) Shell = 47 ( 47 ) Face = 194 ( 194 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 502 ( 504 ) -TOLERANCE : MaxTol = 0.0205434719 ( 0.0293421419 ) AvgTol = 0.0005065999101 ( 0.00138068504 ) +TPSTAT : Faulties = 0 ( 4 ) Warnings = 71 ( 103 ) Summary = 71 ( 107 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 23 ( 23 ) Shell = 47 ( 47 ) Face = 194 ( 194 ) Summary = 1351 ( 1357 ) +STATSHAPE : Solid = 23 ( 23 ) Shell = 47 ( 47 ) Face = 194 ( 194 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 503 ( 504 ) +TOLERANCE : MaxTol = 0.0205434719 ( 0.02934184848 ) AvgTol = 0.0005829973732 ( 0.001382749784 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 69 ( 67 ) N2Labels = 0 ( 0 ) TotalLabels = 72 ( 70 ) NameLabels = 5 ( 5 ) ColorLabels = 47 ( 45 ) LayerLabels = 43 ( 45 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/step_2/G6 b/tests/de/step_2/G6 index c437d5dc9b..0b060a8b57 100644 --- a/tests/de/step_2/G6 +++ b/tests/de/step_2/G6 @@ -1,13 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + set filename PRO10360.stp set ref_data { DATA : Faulties = 0 ( 30 ) Warnings = 0 ( 0 ) Summary = 0 ( 30 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 9 ( 45 ) Summary = 9 ( 45 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 11 ( 45 ) Summary = 11 ( 45 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 5 ( 5 ) Shell = 6 ( 6 ) Face = 78 ( 78 ) Summary = 468 ( 468 ) STATSHAPE : Solid = 5 ( 5 ) Shell = 6 ( 6 ) Face = 78 ( 78 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 179 ( 179 ) -TOLERANCE : MaxTol = 1.742202567e-05 ( 0.0003632648967 ) AvgTol = 9.91071441e-07 ( 6.746245548e-06 ) +TOLERANCE : MaxTol = 0.0009980694921 ( 0.0003632612641 ) AvgTol = 7.921413488e-006 ( 6.746187008e-006 ) 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/step_2/M7 b/tests/de/step_2/M7 index 377c183be5..85f05e880d 100644 --- a/tests/de/step_2/M7 +++ b/tests/de/step_2/M7 @@ -3,11 +3,11 @@ set filename trj12_b3-ug-214.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 2 ( 66 ) Summary = 2 ( 66 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 66 ) Summary = 0 ( 66 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 696 ( 696 ) Summary = 4636 ( 4636 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 696 ( 696 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1943 ( 1943 ) -TOLERANCE : MaxTol = 0.02098499877 ( 0.09930380124 ) AvgTol = 0.002124131329 ( 0.006931207463 ) +TOLERANCE : MaxTol = 0.02098499877 ( 0.09930280821 ) AvgTol = 0.002131657911 ( 0.00709141054 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_2/S1 b/tests/de/step_2/S1 index c3a1425f4b..85394d9a85 100755 --- a/tests/de/step_2/S1 +++ b/tests/de/step_2/S1 @@ -10,9 +10,9 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 40 ( 18 ) Summary = 40 ( 18 ) CHECKSHAPE : Wires = 64 ( 48 ) Faces = 64 ( 48 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 15 ( 16 ) Shell = 17 ( 17 ) Face = 367 ( 366 ) Summary = 2506 ( 2495 ) -STATSHAPE : Solid = 71 ( 79 ) Shell = 87 ( 87 ) Face = 2740 ( 2732 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1064 ( 1057 ) -TOLERANCE : MaxTol = 4.483126782 ( 5.153790881 ) AvgTol = 0.05936982281 ( 0.06645133562 ) +NBSHAPES : Solid = 15 ( 16 ) Shell = 17 ( 17 ) Face = 367 ( 366 ) Summary = 2507 ( 2495 ) +STATSHAPE : Solid = 71 ( 79 ) Shell = 87 ( 87 ) Face = 2740 ( 2732 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1065 ( 1057 ) +TOLERANCE : MaxTol = 4.483126782 ( 5.153790881 ) AvgTol = 0.05989244484 ( 0.06644999522 ) LABELS : N0Labels = 10 ( 10 ) N1Labels = 32 ( 32 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 22 ( 22 ) ColorLabels = 22 ( 22 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) diff --git a/tests/de/step_2/S9 b/tests/de/step_2/S9 index 4efcc36fdc..5f51e7d0be 100644 --- a/tests/de/step_2/S9 +++ b/tests/de/step_2/S9 @@ -5,11 +5,11 @@ set filename trj6_b1-ec-214.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 5 ( 11 ) Summary = 5 ( 11 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 7 ( 13 ) Summary = 7 ( 13 ) CHECKSHAPE : Wires = 4 ( 4 ) Faces = 4 ( 4 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 292 ( 292 ) Summary = 1707 ( 1707 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 292 ( 292 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 718 ( 718 ) -TOLERANCE : MaxTol = 0.1252883206 ( 0.1252874378 ) AvgTol = 0.003079961606 ( 0.01117254297 ) +TOLERANCE : MaxTol = 0.1186503045 ( 0.118648605 ) AvgTol = 0.002773823425 ( 0.01172933156 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 20 ( 20 ) NameLabels = 1 ( 1 ) ColorLabels = 20 ( 20 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) diff --git a/tests/de/step_2/Y5 b/tests/de/step_2/Y5 index a36b39e710..f0b5b6db0e 100644 --- a/tests/de/step_2/Y5 +++ b/tests/de/step_2/Y5 @@ -7,11 +7,11 @@ set filename BUC60810.stp set ref_data { DATA : Faulties = 0 ( 9 ) Warnings = 0 ( 0 ) Summary = 0 ( 9 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 77 ( 39 ) Summary = 77 ( 39 ) -CHECKSHAPE : Wires = 0 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 52 ( 38 ) Summary = 52 ( 38 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 10 ( 10 ) Shell = 12 ( 12 ) Face = 269 ( 269 ) Summary = 1638 ( 1636 ) STATSHAPE : Solid = 10 ( 10 ) Shell = 12 ( 12 ) Face = 269 ( 269 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 636 ( 636 ) -TOLERANCE : MaxTol = 0.01008857123 ( 0.01008857108 ) AvgTol = 0.0003104589496 ( 0.0003616303196 ) +TOLERANCE : MaxTol = 0.01008847035 ( 0.01044437073 ) AvgTol = 0.0002920368527 ( 0.0002926250264 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_3/A5 b/tests/de/step_3/A5 index dcb4c97a7d..91b09720aa 100755 --- a/tests/de/step_3/A5 +++ b/tests/de/step_3/A5 @@ -1,16 +1,13 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" - - set filename trj8_pm6-hc-214.stp set ref_data { -DATA : Faulties = 0 ( 20 ) Warnings = 0 ( 0 ) Summary = 0 ( 20 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 11 ( 544 ) Summary = 11 ( 544 ) -CHECKSHAPE : Wires = 10 ( 0 ) Faces = 10 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +DATA : Faulties = 0 ( 20 ) Warnings = 0 ( 60 ) Summary = 0 ( 80 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 14 ( 545 ) Summary = 14 ( 545 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 98 ( 98 ) Shell = 98 ( 98 ) Face = 1506 ( 1506 ) Summary = 9228 ( 9224 ) STATSHAPE : Solid = 272 ( 272 ) Shell = 272 ( 272 ) Face = 3216 ( 3216 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3297 ( 3293 ) -TOLERANCE : MaxTol = 0.9562231856 ( 3.3196868 ) AvgTol = 0.0007146007958 ( 0.003703900307 ) +TOLERANCE : MaxTol = 0.9320948364 ( 3.3196868 ) AvgTol = 0.0006692799479 ( 0.003731717341 ) LABELS : N0Labels = 230 ( 230 ) N1Labels = 1909 ( 1909 ) N2Labels = 0 ( 0 ) TotalLabels = 2139 ( 2139 ) NameLabels = 633 ( 633 ) ColorLabels = 1604 ( 1604 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 161 ( 161 ) Volume = 161 ( 161 ) Area = 161 ( 161 ) NCOLORS : NColors = 6 ( 6 ) diff --git a/tests/de/step_3/C9 b/tests/de/step_3/C9 index 5b14b318a2..4565e4adca 100644 --- a/tests/de/step_3/C9 +++ b/tests/de/step_3/C9 @@ -6,11 +6,11 @@ set filename r0501_pe.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 48 ( 180 ) Summary = 48 ( 180 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 182 ) Summary = 8 ( 182 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) Summary = 12742 ( 12741 ) -STATSHAPE : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 5273 ( 5272 ) -TOLERANCE : MaxTol = 0.2357145058 ( 0.2065786276 ) AvgTol = 0.009610117691 ( 0.0246139599 ) +NBSHAPES : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) Summary = 12742 ( 12742 ) +STATSHAPE : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 5273 ( 5273 ) +TOLERANCE : MaxTol = 0.2357145058 ( 0.2065786276 ) AvgTol = 0.009584905942 ( 0.02463020793 ) LABELS : N0Labels = 9 ( 9 ) N1Labels = 1311 ( 1311 ) N2Labels = 0 ( 0 ) TotalLabels = 1320 ( 1320 ) NameLabels = 17 ( 17 ) ColorLabels = 1303 ( 1303 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 10 ) diff --git a/tests/de/step_3/D8 b/tests/de/step_3/D8 index 9c85e72e41..f6390581db 100755 --- a/tests/de/step_3/D8 +++ b/tests/de/step_3/D8 @@ -1,15 +1,15 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO OCC26973 Windows: Error : 1 differences with reference data found" +puts "TODO CR00000 Windows: Error : 1 differences with reference data found" set filename trj6_pm4-hc-214.stp set ref_data { DATA : Faulties = 0 ( 20 ) Warnings = 0 ( 60 ) Summary = 0 ( 80 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 21 ( 557 ) Summary = 21 ( 557 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 21 ( 559 ) Summary = 21 ( 559 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 98 ( 98 ) Shell = 98 ( 98 ) Face = 1506 ( 1506 ) Summary = 9261 ( 9257 ) STATSHAPE : Solid = 272 ( 272 ) Shell = 272 ( 272 ) Face = 3216 ( 3216 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3315 ( 3311 ) -TOLERANCE : MaxTol = 0.9562231856 ( 3.3196868 ) AvgTol = 0.0007127401639 ( 0.003722159846 ) +TOLERANCE : MaxTol = 0.9320948364 ( 3.3196868 ) AvgTol = 0.0006671033899 ( 0.003722160054 ) LABELS : N0Labels = 230 ( 230 ) N1Labels = 1909 ( 1909 ) N2Labels = 0 ( 0 ) TotalLabels = 2139 ( 2139 ) NameLabels = 633 ( 633 ) ColorLabels = 1506 ( 1506 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 98 ( 98 ) Volume = 98 ( 98 ) Area = 98 ( 98 ) NCOLORS : NColors = 6 ( 6 ) diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9 index 469cca1933..adb333147a 100755 --- a/tests/de/step_3/D9 +++ b/tests/de/step_3/D9 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" set LinuxDiff 3 @@ -6,11 +7,11 @@ set filename 53921163S0.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 17 ( 27 ) Summary = 17 ( 27 ) -CHECKSHAPE : Wires = 10 ( 10 ) Faces = 10 ( 10 ) Shells = 0 ( 0 ) Solids = 1 ( 1 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 12 ( 25 ) Summary = 12 ( 25 ) +CHECKSHAPE : Wires = 8 ( 7 ) Faces = 8 ( 9 ) Shells = 0 ( 0 ) Solids = 1 ( 1 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 556 ( 556 ) Summary = 3658 ( 3661 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 556 ( 556 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1523 ( 1526 ) -TOLERANCE : MaxTol = 60.79282309 ( 60.87483475 ) AvgTol = 1.272227708 ( 1.266017009 ) +TOLERANCE : MaxTol = 60.79282309 ( 60.87483475 ) AvgTol = 1.273875452 ( 1.266048218 ) 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/step_3/E6 b/tests/de/step_3/E6 index 87208ffad8..bcd42a93b4 100755 --- a/tests/de/step_3/E6 +++ b/tests/de/step_3/E6 @@ -1,5 +1,4 @@ # !!!! 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: STATSHAPE : Faulty" @@ -7,10 +6,10 @@ set filename Z8M6SAT.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 3 ( 0 ) Warnings = 944 ( 3168 ) Summary = 947 ( 3168 ) -CHECKSHAPE : Wires = 52 ( 41 ) Faces = 52 ( 48 ) Shells = 0 ( 2 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 28 ( 28 ) Shell = 768 ( 30 ) Face = 3240 ( 3239 ) Summary = 29370 ( 28626 ) -STATSHAPE : Solid = 28 ( 28 ) Shell = 768 ( 30 ) Face = 3240 ( 3239 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 12584 ( 12576 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 940 ( 3170 ) Summary = 940 ( 3170 ) +CHECKSHAPE : Wires = 49 ( 43 ) Faces = 50 ( 49 ) Shells = 0 ( 2 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 28 ( 28 ) Shell = 768 ( 30 ) Face = 3240 ( 3239 ) Summary = 29373 ( 28626 ) +STATSHAPE : Solid = 28 ( 28 ) Shell = 768 ( 30 ) Face = 3240 ( 3239 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 12585 ( 12577 ) TOLERANCE : MaxTol = 15.00300076 ( 20.46526799 ) AvgTol = 0.02248945623 ( 0.03724082116 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) diff --git a/tests/de/step_3/E7 b/tests/de/step_3/E7 index d544982821..ce1822d458 100644 --- a/tests/de/step_3/E7 +++ b/tests/de/step_3/E7 @@ -8,11 +8,11 @@ set filename r0301_db.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 1188 ( 892 ) Summary = 1188 ( 892 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 1191 ( 892 ) Summary = 1191 ( 892 ) CHECKSHAPE : Wires = 2 ( 2 ) Faces = 2 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 94 ( 94 ) Shell = 288 ( 270 ) Face = 3469 ( 3469 ) Summary = 30724 ( 27788 ) STATSHAPE : Solid = 94 ( 94 ) Shell = 288 ( 270 ) Face = 3469 ( 3469 ) FreeWire = 0 ( 102 ) FreeEdge = 2219 ( 2219 ) SharedEdge = 11315 ( 11109 ) -TOLERANCE : MaxTol = 0.6657106829 ( 0.6657106829 ) AvgTol = 0.00118387315 ( 0.004767889079 ) +TOLERANCE : MaxTol = 0.7534869223 ( 0.7534869223 ) AvgTol = 0.001396114327 ( 0.005005952008 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 1838 ( 1839 ) N2Labels = 0 ( 0 ) TotalLabels = 1839 ( 1840 ) NameLabels = 1 ( 1 ) ColorLabels = 164 ( 164 ) LayerLabels = 1761 ( 1762 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) diff --git a/tests/de/step_3/E8 b/tests/de/step_3/E8 index 110a5ea3c4..6c0baadaf9 100644 --- a/tests/de/step_3/E8 +++ b/tests/de/step_3/E8 @@ -8,11 +8,11 @@ set filename r0301soe_db.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 1207 ( 1000 ) Summary = 1207 ( 1000 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 1097 ( 1010 ) Summary = 1097 ( 1010 ) CHECKSHAPE : Wires = 2 ( 2 ) Faces = 2 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 95 ( 95 ) Shell = 289 ( 271 ) Face = 3569 ( 3569 ) Summary = 31394 ( 28458 ) STATSHAPE : Solid = 95 ( 95 ) Shell = 289 ( 271 ) Face = 3569 ( 3569 ) FreeWire = 0 ( 102 ) FreeEdge = 2219 ( 2219 ) SharedEdge = 11600 ( 11394 ) -TOLERANCE : MaxTol = 0.6657106806 ( 0.6657106806 ) AvgTol = 0.001017158361 ( 0.003936202705 ) +TOLERANCE : MaxTol = 6.130469828 ( 6.130469828 ) AvgTol = 0.002401767839 ( 0.005281779337 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 1839 ( 1840 ) N2Labels = 0 ( 0 ) TotalLabels = 1840 ( 1841 ) NameLabels = 1 ( 1 ) ColorLabels = 165 ( 165 ) LayerLabels = 1762 ( 1763 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) diff --git a/tests/de/step_4/H5 b/tests/de/step_4/H5 index e42a76e2d9..83f1f79ec7 100644 --- a/tests/de/step_4/H5 +++ b/tests/de/step_4/H5 @@ -3,11 +3,11 @@ set filename trj10_pm8-ug-214.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 8 ) Summary = 8 ( 8 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 5 ( 8 ) Summary = 5 ( 8 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 523 ( 523 ) Summary = 3681 ( 3681 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 523 ( 523 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1541 ( 1541 ) -TOLERANCE : MaxTol = 0.01992087066 ( 0.05869739556 ) AvgTol = 0.003202413767 ( 0.008376755892 ) +TOLERANCE : MaxTol = 0.01992087066 ( 0.05869680859 ) AvgTol = 0.003230278816 ( 0.009187997783 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 347 ( 347 ) N2Labels = 0 ( 0 ) TotalLabels = 348 ( 348 ) NameLabels = 1 ( 1 ) ColorLabels = 348 ( 348 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) diff --git a/tests/de/step_4/H8 b/tests/de/step_4/H8 index b36604096d..83ead97c39 100644 --- a/tests/de/step_4/H8 +++ b/tests/de/step_4/H8 @@ -3,11 +3,11 @@ set filename PRO15686.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 31 ) Summary = 6 ( 31 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 9 ( 33 ) Summary = 9 ( 33 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 1049 ( 1049 ) Summary = 7165 ( 7163 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 1049 ( 1049 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3015 ( 3013 ) -TOLERANCE : MaxTol = 0.2096553196 ( 0.2096553196 ) AvgTol = 0.0006174123099 ( 0.006216471924 ) +TOLERANCE : MaxTol = 0.2096553196 ( 0.2096553196 ) AvgTol = 0.001207912297 ( 0.006911541022 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_4/I3 b/tests/de/step_4/I3 index d50026e0ff..d15fa746d6 100644 --- a/tests/de/step_4/I3 +++ b/tests/de/step_4/I3 @@ -1,16 +1,15 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: TPSTAT : Faulty" - set filename bm4_db_seal_a.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 117 ( 37 ) Summary = 117 ( 37 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 116 ( 36 ) Summary = 116 ( 36 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 140 ( 140 ) Summary = 704 ( 704 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 140 ( 140 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 280 ( 280 ) -TOLERANCE : MaxTol = 0.0004823436197 ( 0.0004827870033 ) AvgTol = 0.0001520351263 ( 0.0001573776642 ) +TOLERANCE : MaxTol = 0.0004823436197 ( 0.0004827870033 ) AvgTol = 0.0001514666129 ( 0.0001575453709 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) diff --git a/tests/de/step_5/A1 b/tests/de/step_5/A1 index 0baab19806..ed9ba4318c 100755 --- a/tests/de/step_5/A1 +++ b/tests/de/step_5/A1 @@ -1,13 +1,15 @@ # !!!! This file is generated automatically, do not edit manually! See end script + +set LinuxDiff 3 set filename Z8INV5.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 122 ( 622 ) Summary = 122 ( 622 ) -CHECKSHAPE : Wires = 19 ( 19 ) Faces = 19 ( 21 ) Shells = 1 ( 1 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 22 ( 22 ) Shell = 24 ( 24 ) Face = 1520 ( 1520 ) Summary = 11231 ( 11206 ) -STATSHAPE : Solid = 22 ( 22 ) Shell = 24 ( 24 ) Face = 1520 ( 1520 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 4797 ( 4781 ) -TOLERANCE : MaxTol = 7.159520237 ( 15.55113015 ) AvgTol = 0.03830637421 ( 0.03863233285 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 118 ( 622 ) Summary = 118 ( 622 ) +CHECKSHAPE : Wires = 16 ( 16 ) Faces = 17 ( 19 ) Shells = 1 ( 1 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 22 ( 22 ) Shell = 24 ( 24 ) Face = 1519 ( 1519 ) Summary = 11220 ( 11209 ) +STATSHAPE : Solid = 22 ( 22 ) Shell = 24 ( 24 ) Face = 1519 ( 1519 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 4793 ( 4785 ) +TOLERANCE : MaxTol = 7.159520237 ( 7.159520237 ) AvgTol = 0.03414100054 ( 0.03415856171 ) LABELS : N0Labels = 25 ( 25 ) N1Labels = 23 ( 23 ) N2Labels = 0 ( 0 ) TotalLabels = 48 ( 48 ) NameLabels = 48 ( 48 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_5/A3 b/tests/de/step_5/A3 index afb49702c6..4ea7b83d69 100644 --- a/tests/de/step_5/A3 +++ b/tests/de/step_5/A3 @@ -3,11 +3,11 @@ set filename trj9_pm7-ug-214.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 8 ( 8 ) Summary = 8 ( 8 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 5 ( 8 ) Summary = 5 ( 8 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 523 ( 523 ) Summary = 3681 ( 3681 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 523 ( 523 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1541 ( 1541 ) -TOLERANCE : MaxTol = 0.01992087066 ( 0.05869739556 ) AvgTol = 0.003263131163 ( 0.008376755893 ) +TOLERANCE : MaxTol = 0.01992087066 ( 0.05869680859 ) AvgTol = 0.003286507119 ( 0.009187997783 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 347 ( 347 ) N2Labels = 0 ( 0 ) TotalLabels = 348 ( 348 ) NameLabels = 1 ( 1 ) ColorLabels = 348 ( 348 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) diff --git a/tests/heal/wire_tails_real/A5 b/tests/heal/wire_tails_real/A5 index 54ac8da2c6..8cbda82dc6 100644 --- a/tests/heal/wire_tails_real/A5 +++ b/tests/heal/wire_tails_real/A5 @@ -4,5 +4,5 @@ stepread [locate_data_file bug26261_ca07771-040x.stp] s * renamevar s_1 s fixshape r s -maxtaila 1 -maxtailw 1e-3 -checknbshapes r -vertex 25951 -edge 42000 -wire 16519 -face 16205 -shell 51 -solid 1 -compsolid 0 -compound 2 +checknbshapes r -vertex 25952 -edge 42001 -wire 16519 -face 16205 -shell 51 -solid 1 -compsolid 0 -compound 2 checkprops r -l 127197.46264592493