Compiler error has been eliminated.

DRAW-command has been added.
0017129: ShapeFix projector makes 2d curves with oscillations
2025-09-08 14:17:06 +03:00 · 2015-09-08 11:30:14 +03:00 · 2015-09-07 18:09:28 +03:00 · 2015-09-07 18:08:34 +03:00 · 2015-09-07 18:06:42 +03:00
318 changed files with 943 additions and 827 deletions
--- a/src/BRep/BRep_Builder.cxx
+++ b/src/BRep/BRep_Builder.cxx
@@ -563,7 +563,6 @@ void  BRep_Builder::MakeEdge(TopoDS_Edge& E) const
  {
    TopoDS_LockedShape::Raise("BRep_Builder::MakeEdge");
  }
-  TE->Closed(Standard_False);
  MakeShape(E,TE);
 }

@@ -586,7 +585,6 @@ void  BRep_Builder::UpdateEdge(const TopoDS_Edge& E,
  const TopLoc_Location l = L.Predivided(E.Location());

  UpdateCurves(TE->ChangeCurves(),C,l);
-  if (!C.IsNull()) TE->Closed(C->IsClosed());

  TE->UpdateTolerance(Tol);
  TE->Modified(Standard_True);
@@ -665,8 +663,6 @@ void  BRep_Builder::UpdateEdge(const TopoDS_Edge& E,
  const TopLoc_Location l = L.Predivided(E.Location());

  UpdateCurves(TE->ChangeCurves(),C1,C2,S,l);
-  if (!C1.IsNull() && !C2.IsNull()) 
-    TE->Closed(C1->IsClosed() && C2->IsClosed());

  TE->UpdateTolerance(Tol);
  TE->Modified(Standard_True);
@@ -695,8 +691,6 @@ void  BRep_Builder::UpdateEdge(const TopoDS_Edge& E,
  const TopLoc_Location l = L.Predivided(E.Location());

  UpdateCurves(TE->ChangeCurves(),C1,C2,S,l,Pf,Pl);
-  if (!C1.IsNull() && !C2.IsNull()) 
-    TE->Closed(C1->IsClosed() && C2->IsClosed());

  TE->UpdateTolerance(Tol);
  TE->Modified(Standard_True);
@@ -768,14 +762,14 @@ void  BRep_Builder::UpdateEdge(const TopoDS_Edge& E,
  while (itcr.More())
  {
    if (itcr.Value()->IsPolygonOnTriangulation(T,l))
-	{
+    {
      // cr is used to keep a reference on the curve representation
      // this avoid deleting it as its content may be referenced by T
      cr = itcr.Value();
      lcr.Remove(itcr);
      isModified = Standard_True;
      break;
-	}
+    }
    itcr.Next();
  }

@@ -1093,23 +1087,8 @@ void  BRep_Builder::Range(const TopoDS_Edge&  E,
  
  while (itcr.More()) {
    GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if (!GC.IsNull()) {
-      if (!Only3d || GC->IsCurve3D())
-	GC->SetRange(First,Last);
-      if (GC->IsCurve3D()) {
-        // Set the closedness flag to the correct value.
-        Handle(Geom_Curve) C = GC->Curve3D();
-        
-        //fixing a bug PRO18577 to avoid infinite values of First and Last 
-        if ( !C.IsNull() && 
-            !Precision::IsNegativeInfinite(First) && 
-            !Precision::IsPositiveInfinite(Last) )   {
-          Standard_Boolean closed = 
-            C->Value(First).IsEqual(C->Value(Last),BRep_Tool::Tolerance(E));
-          TE->Closed(closed);
-        }
-      }
-    }
+    if (!GC.IsNull() && (!Only3d || GC->IsCurve3D()))
+      GC->SetRange(First,Last);
    itcr.Next();
  }
  
@@ -1141,20 +1120,10 @@ void  BRep_Builder::Range(const TopoDS_Edge& E,

  while (itcr.More()) {
    GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if (!GC.IsNull()) {
-      if (GC->IsCurveOnSurface(S,l)) {
-        GC->SetRange(First,Last);
-
-        // Set the closedness flag to the correct value.
-        Handle(Geom2d_Curve) PC = GC->PCurve();
-        gp_Pnt2d P1 = PC->Value(First);
-        gp_Pnt2d P2 = PC->Value(Last);
-        gp_Pnt   PP1 = S->Value(P1.X(),P1.Y());
-        gp_Pnt   PP2 = S->Value(P2.X(),P2.Y());
-        Standard_Boolean closed = PP1.IsEqual(PP2,BRep_Tool::Tolerance(E));
-        TE->Closed(closed);
-        break;
-      }
+    if (!GC.IsNull() && GC->IsCurveOnSurface(S,l))
+    {
+      GC->SetRange(First,Last);
+      break;
    }
    itcr.Next();
  }
--- a/src/BRep/BRep_Tool.cdl
+++ b/src/BRep/BRep_Tool.cdl
@@ -49,14 +49,15 @@ is

    -----------------------------------------------------------
    -----------------------------------------------------------
-    --                         Solid                         -- 
+    --                         Shape                         -- 
    -----------------------------------------------------------
    -----------------------------------------------------------
    IsClosed (myclass; S : Shape from TopoDS) returns Boolean from Standard;
-    	---Purpose: If S is Solid or Shell, returns True if it has no free boundaries (edges).
-		--          If S is Wire, returns True if it has no free ends (vertices).
-		--          (Internal and External sub-shepes are ignored in this check.)
-		--          For other shape types returns S.Closed().
+    ---Purpose: If S is Shell, returns True if it has no free boundaries (edges).
+    --          If S is Wire, returns True if it has no free ends (vertices).
+    --          (Internal and External sub-shepes are ignored in these checks)
+    --          If S is Edge, returns True if its vertices are the same.
+    --          For other shape types returns S.Closed().
    	
    -----------------------------------------------------------
    -----------------------------------------------------------
--- a/src/BRep/BRep_Tool.cxx
+++ b/src/BRep/BRep_Tool.cxx
@@ -1455,7 +1455,7 @@ gp_Pnt2d  BRep_Tool::Parameters(const TopoDS_Vertex& V,
 //=======================================================================
 Standard_Boolean BRep_Tool::IsClosed (const TopoDS_Shape& theShape)
 {
-  if (theShape.ShapeType() == TopAbs_SHELL || theShape.ShapeType() == TopAbs_SOLID)
+  if (theShape.ShapeType() == TopAbs_SHELL)
  {
    NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator);
    TopExp_Explorer exp (theShape.Oriented(TopAbs_FORWARD), TopAbs_EDGE);
@@ -1487,6 +1487,12 @@ Standard_Boolean BRep_Tool::IsClosed (const TopoDS_Shape& theShape)
    }
    return hasBound && aMap.IsEmpty();
  }
+  else if (theShape.ShapeType() == TopAbs_EDGE)
+  {
+    TopoDS_Vertex aVFirst, aVLast;
+    TopExp::Vertices(TopoDS::Edge(theShape), aVFirst, aVLast);
+    return !aVFirst.IsNull() && aVFirst.IsSame(aVLast);
+  }
  return theShape.Closed();
 }

--- a/src/BRepAlgo/BRepAlgo_Loop.cxx
+++ b/src/BRepAlgo/BRepAlgo_Loop.cxx
@@ -826,7 +826,7 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
 	{
 	  gp_Pnt2d pf, pl;
 	  BRep_Tool::UVPoints( EE, myFace, pf, pl );
-	  if (pf.Distance(pl) <= Tol && !EE.Closed())
+	  if (pf.Distance(pl) <= Tol && !BRep_Tool::IsClosed(EE))
 	    NE.Remove(it);
 	  else
 	    it.Next();
--- a/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx
+++ b/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx
@@ -92,7 +92,6 @@ void BRepFeat_MakeCylindricalHole::Perform(const Standard_Real Radius)
  TopoDS_Solid theTool;
  B.MakeSolid(theTool);
  B.Add(theTool,theCylinder.Shell());
-  theTool.Closed(Standard_True);

  myTopFace = theCylinder.TopFace();
  myBotFace = theCylinder.BottomFace();
@@ -193,7 +192,6 @@ void BRepFeat_MakeCylindricalHole::PerformThruNext(const Standard_Real Radius,
  TopoDS_Solid theTool;
  B.MakeSolid(theTool);
  B.Add(theTool,theCylinder.Shell());
-  theTool.Closed(Standard_True);

  myTopFace = theCylinder.TopFace();
  myBotFace = theCylinder.BottomFace();
@@ -344,7 +342,6 @@ void BRepFeat_MakeCylindricalHole::PerformUntilEnd(const Standard_Real Radius,
  TopoDS_Solid theTool;
  B.MakeSolid(theTool);
  B.Add(theTool,theCylinder.Shell());
-  theTool.Closed(Standard_True);

  myTopFace = theCylinder.TopFace();
  myBotFace = theCylinder.BottomFace();
@@ -474,7 +471,6 @@ void BRepFeat_MakeCylindricalHole::Perform(const Standard_Real Radius,
  TopoDS_Solid theTool;
  B.MakeSolid(theTool);
  B.Add(theTool,theCylinder.Shell());
-  theTool.Closed(Standard_True);

  myTopFace = theCylinder.TopFace();
  myBotFace = theCylinder.BottomFace();
@@ -603,7 +599,6 @@ void BRepFeat_MakeCylindricalHole::PerformBlind(const Standard_Real Radius,
  TopoDS_Solid theTool;
  B.MakeSolid(theTool);
  B.Add(theTool,theCylinder.Shell());
-  theTool.Closed(Standard_True);

  myTopFace = theCylinder.TopFace();
  myBotFace.Nullify();
--- a/src/BRepFill/BRepFill.cxx
+++ b/src/BRepFill/BRepFill.cxx
@@ -304,7 +304,6 @@ TopoDS_Face BRepFill::Face(const TopoDS_Edge& Edge1,
  TopoDS_Edge Edge3, Edge4;

  Iso = Surf->UIso(f1);
-//  Tol = Max(BT.Tolerance(V1f), BT.Tolerance(V2f));
  Tol = Max(BRep_Tool::Tolerance(V1f), BRep_Tool::Tolerance(V2f));
  if (Iso->Value(f2).Distance(Iso->Value(l2)) > Tol) {
    B.MakeEdge(Edge3,Iso,Precision::Confusion());
@@ -324,7 +323,6 @@ TopoDS_Face BRepFill::Face(const TopoDS_Edge& Edge1,
  }
  else {
    Iso = Surf->UIso(l1);
-//    Tol = Max(BT.Tolerance(V1l), BT.Tolerance(V2l));
    Tol = Max(BRep_Tool::Tolerance(V1l), BRep_Tool::Tolerance(V2l));
    if (Iso->Value(l2).Distance(Iso->Value(f2)) > Tol) {
      B.MakeEdge(Edge4,Iso,Precision::Confusion());
@@ -436,7 +434,8 @@ TopoDS_Shell BRepFill::Shell(const TopoDS_Wire& Wire1,
    Edge1 = TopoDS::Edge(ex1.Current());
    Edge2 = TopoDS::Edge(ex2.Current());

-    Standard_Boolean Periodic = Edge1.Closed() && Edge2.Closed();
+    Standard_Boolean Periodic =
+      BRep_Tool::IsClosed(Edge1) && BRep_Tool::IsClosed(Edge2);
    
    ex1.Next();
    ex2.Next();
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -3218,7 +3218,7 @@ void CutEdge (const TopoDS_Edge& E,
  CT2d = new Geom2d_TrimmedCurve(C2d,f,l);

  if (CT2d->BasisCurve()->IsKind(STANDARD_TYPE(Geom2d_Circle)) &&
-      E.Closed()) {
+      BRep_Tool::IsClosed(E)) {
    //---------------------------
    // Cut closed circle.
    //---------------------------
--- a/src/BRepFill/BRepFill_Filling.cxx
+++ b/src/BRepFill/BRepFill_Filling.cxx
@@ -681,7 +681,7 @@ void BRepFill_Filling::Build()
    Handle(Geom2d_Curve) aCurveOnPlate = CurvesOnPlate->Value(i);

    TopoDS_Edge NewEdge = TopoDS::Edge(anEdge.EmptyCopied());
-    NewEdge.Closed(anEdge.Closed());
+
    TopoDS_Vertex V1, V2;
    TopExp::Vertices(anEdge, V1, V2, Standard_True); //with orientation
    BB.UpdateVertex(V1, dmax);
--- a/src/BRepFill/BRepFill_Generator.cxx
+++ b/src/BRepFill/BRepFill_Generator.cxx
@@ -612,8 +612,8 @@ void BRepFill_Generator::Perform()
 	Edge2 = TopoDS::Edge(ex2.Current());
      }

-      Standard_Boolean Periodic
-	= (Edge1.Closed() || degen1) && (Edge2.Closed() || degen2);
+      Standard_Boolean Periodic = (BRep_Tool::IsClosed(Edge1) || degen1) &&
+                                  (BRep_Tool::IsClosed(Edge2) || degen2);
      // ATTENTION : a non-punctual wire should not 
      //             contain a punctual edge
      if (!wPoint1) ex1.Next();
@@ -641,12 +641,6 @@ void BRepFill_Generator::Perform()
 	  Vl_toMap = V1l;
 	}

-      if(Periodic) {
-	Standard_Boolean E1IsReallyClosed = BRepTools::Compare(V1f,V1l);
-	Standard_Boolean E2IsReallyClosed = BRepTools::Compare(V2f,V2l);
-	Periodic 
-	  = (E1IsReallyClosed || degen1) && (E2IsReallyClosed || degen2);
-      }
      // processing of KPart
      Standard_Integer IType = DetectKPart(Edge1,Edge2);
      if (IType==0) {
--- a/src/BRepFill/BRepFill_NSections.cxx
+++ b/src/BRepFill/BRepFill_NSections.cxx
@@ -573,7 +573,7 @@ void BRepFill_NSections::Init(const TColStd_SequenceOfReal & P,
 	    Last = aux;
 	    C =  CBis;
 	  } 
-	  if ((ii>1) || (!E.Closed()) ) { // Cut C
+	  if ((ii>1) || (!BRep_Tool::IsClosed(E)) ) { // Cut C
 	    Handle(Geom_TrimmedCurve) TC = 
 	      new (Geom_TrimmedCurve) (C,First, Last);
 	    C  = TC;
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -263,10 +263,7 @@ static Standard_Boolean KPartCircle
    C = Ct->BasisCurve();
  }

-  TopoDS_Vertex V1,V2;
-  TopExp::Vertices(E,V1,V2);
-  if (!V1.IsSame(V2) || //open result or closed circle
-      C->IsKind(STANDARD_TYPE(Geom_Circle))) 
+  if ((C->IsKind(STANDARD_TYPE(Geom_Circle)) && BRep_Tool::IsClosed(E))) //closed circle      
  {
    Standard_Real anOffset = myOffset;
    if (E.Orientation() == TopAbs_REVERSED) anOffset *= -1;
--- a/src/BRepFill/BRepFill_Pipe.cxx
+++ b/src/BRepFill/BRepFill_Pipe.cxx
@@ -575,18 +575,18 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S,
      B.MakeShell(TopoDS::Shell(result));
      B.MakeWire(W);
      B.Add(W, S);
-      W.Closed(S.Closed());
+      W.Closed(BRep_Tool::IsClosed(S));
      TheS = W;
      if (!FirstShape.IsNull()) {
 	B.MakeWire(W);
 	B.Add(W, FirstShape);
-	W.Closed(FirstShape.Closed());
+	W.Closed(BRep_Tool::IsClosed(FirstShape));
 	TheFirst = W;
      }
      if (!LastShape.IsNull()) {
 	B.MakeWire(W);
 	B.Add(W, LastShape);
-	W.Closed(LastShape.Closed());
+	W.Closed(BRep_Tool::IsClosed(LastShape));
 	TheLast = W;
      }
      result.Closed (BRep_Tool::IsClosed (result));
--- a/src/BRepFill/BRepFill_Section.cxx
+++ b/src/BRepFill/BRepFill_Section.cxx
@@ -46,7 +46,6 @@ BRepFill_Section::BRepFill_Section(const TopoDS_Shape& Profile,
      BB.Add( DegEdge, aVertex.Oriented(TopAbs_FORWARD) );
      BB.Add( DegEdge, aVertex.Oriented(TopAbs_REVERSED) );
      BB.Degenerated( DegEdge, Standard_True );
-      DegEdge.Closed( Standard_True );
      
      BB.MakeWire( wire );
      BB.Add( wire, DegEdge );
--- a/src/BRepFill/BRepFill_ShapeLaw.cxx
+++ b/src/BRepFill/BRepFill_ShapeLaw.cxx
@@ -149,23 +149,12 @@ void BRepFill_ShapeLaw::Init(const Standard_Boolean Build)
 	    C = CBis;
 	  }

-	  Standard_Boolean IsReallyClosed = E.Closed();
-	  //IFV - some checking when closed flag is wrong
-	  if(IsReallyClosed) {
-	    TopoDS_Vertex V1, V2;
-	    TopExp::Vertices(E, V1, V2);
-	    if(V1.IsNull() || V2.IsNull()) {
-	      IsReallyClosed = Standard_False;
-	    }
-	    else {
-	      IsReallyClosed = V1.IsSame(V2);
-	    }
-	  }
-          if (IsReallyClosed &&
+          Standard_Boolean IsClosed = BRep_Tool::IsClosed(E);
+          if (IsClosed &&
              Abs(C->FirstParameter() - First) > Precision::PConfusion())
-            IsReallyClosed = Standard_False; //trimmed curve differs
+            IsClosed = Standard_False; //trimmed curve differs

-	  if ((ii>1) || !IsReallyClosed ) { // Trim C
+	  if ((ii>1) || !IsClosed ) { // Trim C
 	    Handle(Geom_TrimmedCurve) TC = new Geom_TrimmedCurve(C,First, Last);
 	    C = TC;
 	  }
--- a/src/BRepLib/BRepLib.cxx
+++ b/src/BRepLib/BRepLib.cxx
@@ -361,15 +361,9 @@ Standard_Boolean  BRepLib::BuildCurve3d(const TopoDS_Edge& AnEdge,
    Standard_Real First, Last;

    BRep_Builder B;
-    Standard_Boolean is_closed ;
-    is_closed = AnEdge.Closed() ;
-
    B.UpdateEdge(AnEdge,C3d,LocalLoc,0.0e0);
    BRep_Tool::Range(AnEdge, S, LC, First, Last);
    B.Range(AnEdge, First, Last); //Do not forget 3D range.(PRO6412)
-    TopoDS_Edge E = AnEdge ;
-    E.Closed(is_closed) ;
-
  }
  else {
    //
@@ -430,14 +424,10 @@ Standard_Boolean  BRepLib::BuildCurve3d(const TopoDS_Edge& AnEdge,
      max_deviation = Max( tolerance, Tolerance );
      if (NewCurvePtr.IsNull())
        return Standard_False;
-      Standard_Boolean is_closed ;
-      is_closed = AnEdge.Closed() ;
      B.UpdateEdge(TopoDS::Edge(AnEdge),
        NewCurvePtr,
        L[0],
        max_deviation) ;
-      TopoDS_Edge  E = AnEdge ;
-      E.Closed(is_closed) ;
      if (jj == 1 ) {
        //
        // if there is only one curve on surface attached to the edge
--- a/src/BRepLib/BRepLib_MakeWire.cxx
+++ b/src/BRepLib/BRepLib_MakeWire.cxx
@@ -279,7 +279,6 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
 	// copy the edge
 	TopoDS_Shape Dummy = EE.EmptyCopied();
 	myEdge = TopoDS::Edge(Dummy);
-	myEdge.Closed(EE.Closed());
 	
 	for (it.Initialize(EE); it.More(); it.Next()) {

--- a/src/BRepLib/BRepLib_MakeWire_1.cxx
+++ b/src/BRepLib/BRepLib_MakeWire_1.cxx
@@ -97,7 +97,6 @@ void  BRepLib_MakeWire::Add(const TopTools_ListOfShape& L)
 	  TopoDS_Edge newEd=TopoDS::Edge(aLocalShape);
 //	  TopoDS_Edge newEd=TopoDS::Edge(curEd.EmptyCopied());
 	  BB.Transfert(curEd, newEd);
-	  newEd.Closed(curEd.Closed());
 	  TopTools_ListIteratorOfListOfShape itV(nlist);
 	  for (; itV.More(); itV.Next()) {
 	    BB.Add(newEd, itV.Value());
--- a/src/BRepOffset/BRepOffset_Offset.cxx
+++ b/src/BRepOffset/BRepOffset_Offset.cxx
@@ -179,43 +179,6 @@ static void UpdateEdge (const TopoDS_Edge& E,
  B.UpdateEdge(E,NC1,NC2,F,Tol);
 }

-//=======================================================================
-//function : Range3d
-//purpose  : Set the range only on the 3d curve 
-//           waitint that BRep_Builder does it !!
-//=======================================================================
-
-static void Range3d (const TopoDS_Edge&  E, 
-		     const Standard_Real First, 
-		     const Standard_Real Last) 
-{
-  //  set the range to all the representations
-  const Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &E.TShape());
-  
-  BRep_ListOfCurveRepresentation& lcr = TE->ChangeCurves();
-  BRep_ListIteratorOfListOfCurveRepresentation itcr(lcr);
-  Handle(BRep_GCurve) GC;
-  
-  while (itcr.More()) {
-    GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if (!GC.IsNull()) {
-      if (GC->IsCurve3D()) {
-	GC->SetRange(First,Last);
-	// Set the closedness flag to the correct value.
-	Handle(Geom_Curve) C = GC->Curve3D();
-	if ( !C.IsNull() ) {
-	  Standard_Boolean closed = 
-	    C->Value(First).IsEqual(C->Value(Last),BRep_Tool::Tolerance(E));
-	  TE->Closed(closed);
-	}
-      }
-    }
-    itcr.Next();
-  }
-
-  TE->Modified(Standard_True);
-}
-

 //=======================================================================
 //function : ComputeCurve3d
@@ -1165,12 +1128,11 @@ void BRepOffset_Offset::Init(const TopoDS_Edge&     Path,

  // mise a same range de la nouvelle pcurve.
  if ( !C1is3D && !C1Denerated)
-  myBuilder.SameRange    (Edge1,Standard_False);
-  if ( !C1is3D && !C1Denerated) 
-    Range3d(Edge1,U1,U2);
-  myBuilder.Range       (Edge1,myFace,U1,U2); 
-    Range3d(Edge1,U1,U2);
-  myBuilder.Range       (Edge1,myFace,U1,U2);
+  {
+    myBuilder.SameRange    (Edge1,Standard_False);
+    myBuilder.Range(Edge1,U1,U2, Standard_True);
+  }
+  myBuilder.Range(Edge1,myFace,U1,U2);
  BRepLib::SameRange(Edge1);
  
  // mise a sameparameter pour les KPart
@@ -1206,7 +1168,8 @@ void BRepOffset_Offset::Init(const TopoDS_Edge&     Path,

  // mise a same range de la nouvelle pcurve.
  myBuilder.SameRange    (Edge2,Standard_False);
-  if ( !C2is3D && !C2Denerated) Range3d(Edge2,U1,U2);
+  if ( !C2is3D && !C2Denerated)
+    myBuilder.Range(Edge2, U1, U2, Standard_True);
  myBuilder.Range(Edge2,myFace,U1,U2);
  BRepLib::SameRange(Edge2);
  
--- a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
@@ -316,7 +316,6 @@ void BRepOffsetAPI_ThruSections::AddVertex(const TopoDS_Vertex& aVertex)
  BB.Add( DegEdge, aVertex.Oriented(TopAbs_FORWARD) );
  BB.Add( DegEdge, aVertex.Oriented(TopAbs_REVERSED) );
  BB.Degenerated( DegEdge, Standard_True );
-  DegEdge.Closed( Standard_True );

  TopoDS_Wire DegWire;
  BB.MakeWire( DegWire );
--- a/src/BRepPrim/BRepPrim_Builder.cxx
+++ b/src/BRepPrim/BRepPrim_Builder.cxx
@@ -210,7 +210,6 @@ void BRepPrim_Builder::AddEdgeVertex (TopoDS_Edge& E,
  VV.Orientation(TopAbs_REVERSED);
  myBuilder.Add(E,VV);
  myBuilder.Range(E,P1,P2);
-  E.Closed(Standard_True);
 }

 //=======================================================================
@@ -280,6 +279,7 @@ void  BRepPrim_Builder::CompleteEdge(TopoDS_Edge& E)const

 void  BRepPrim_Builder::CompleteWire(TopoDS_Wire& W)const 
 {
+  W.Closed(BRep_Tool::IsClosed(W));
  BRepTools::Update(W);
 }

@@ -302,5 +302,6 @@ void  BRepPrim_Builder::CompleteFace(TopoDS_Face& F)const

 void  BRepPrim_Builder::CompleteShell(TopoDS_Shell& S)const 
 {
+  S.Closed(BRep_Tool::IsClosed(S));
  BRepTools::Update(S);
 }
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx
@@ -52,7 +52,6 @@ void BRepPrimAPI_MakeOneAxis::Build()
  BRep_Builder B;
  B.MakeSolid(TopoDS::Solid(myShape));
  B.Add(myShape,((BRepPrim_OneAxis*) OneAxis())->Shell());
-  myShape.Closed(Standard_True);
  Done();
 }

--- a/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
@@ -119,7 +119,6 @@ void BRepPrimAPI_MakeWedge::Build()
  BRep_Builder B;
  B.MakeSolid(TopoDS::Solid(myShape));
  B.Add(myShape,myWedge.Shell());
-  myShape.Closed(Standard_True);
  Done();
 }

--- a/src/BRepProj/BRepProj_Projection.cxx
+++ b/src/BRepProj/BRepProj_Projection.cxx
@@ -260,7 +260,7 @@ BRepProj_Projection::BRepProj_Projection (const TopoDS_Shape& Wire,
  BB.Add( DegEdge, aVertex.Oriented(TopAbs_FORWARD) );
  BB.Add( DegEdge, aVertex.Oriented(TopAbs_REVERSED) );
  BB.Degenerated( DegEdge, Standard_True );
-  DegEdge.Closed( Standard_True );
+
  TopoDS_Wire DegWire;
  BB.MakeWire( DegWire );
  BB.Add( DegWire, DegEdge );
--- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
+++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
@@ -256,6 +256,7 @@ TopoDS_Shape BRepSweep_NumLinearRegularSweep::Shape (const TopoDS_Shape& aGenS,
 		TopoDS_Shape wi;
 		myBuilder.MakeWire(wi);
 		myBuilder.Add(wi,newShape,Or);
+		wi.Closed(BRep_Tool::IsClosed(wi));
 		WireSeq.Append(wi);
 	      }
 	      else{
@@ -328,6 +329,7 @@ TopoDS_Shape BRepSweep_NumLinearRegularSweep::Shape (const TopoDS_Shape& aGenS,
 	  }
 	}
 	else{
+	  newWire.Closed(BRep_Tool::IsClosed(newWire));
 	  myBuilder.Add(myShapes(iGenS,iDirS),newWire);
 	}
 	myBuiltShapes(iGenS,iDirS) = Standard_True;
@@ -393,7 +395,10 @@ TopoDS_Shape BRepSweep_NumLinearRegularSweep::Shape (const TopoDS_Shape& aGenS,
    }
    myBuiltShapes(iGenS,iDirS) = Standard_True;
  }
-  myShapes(iGenS,iDirS).Closed (BRep_Tool::IsClosed (myShapes(iGenS,iDirS)));
+  // Change the "Closed" flag only for Wires and Shells
+  if (myShapes(iGenS, iDirS).ShapeType() == TopAbs_WIRE ||
+      myShapes(iGenS, iDirS).ShapeType() == TopAbs_SHELL)
+    myShapes(iGenS,iDirS).Closed (BRep_Tool::IsClosed (myShapes(iGenS,iDirS)));
  return myShapes(iGenS,iDirS);
 }

--- a/src/BRepSweep/BRepSweep_Rotation.cxx
+++ b/src/BRepSweep/BRepSweep_Rotation.cxx
@@ -201,14 +201,7 @@ TopoDS_Shape  BRepSweep_Rotation::MakeEmptyDirectingEdge
    Handle(Geom_Circle) GC = new Geom_Circle(Axis,O.Distance(P));
    Standard_Real tol = BRep_Tool::Tolerance(TopoDS::Vertex(aGenV));
    myBuilder.Builder().MakeEdge(E, GC, tol);
-
-    gp_Pnt PLast = GC->Value(myAng);
-    if(PLast.SquareDistance(P) > tol*tol) E.Closed(Standard_False);
-
  }
-
-    
-
  return E;
 }

--- a/src/BRepTools/BRepTools_ReShape.cxx
+++ b/src/BRepTools/BRepTools_ReShape.cxx
@@ -375,10 +375,7 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
    if ( (modif < 0 && buildmode < 2) || (modif == 0 && buildmode < 1) )
      return C;
    else
-    {
-      S.Closed (BRep_Tool::IsClosed (S));
      return S;
-    }
  }

  if (st == TopAbs_SHELL) {
@@ -542,17 +539,17 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
    //BRepTools_Edge sbe;
    CopyRanges ( TopoDS::Edge ( result ), TopoDS::Edge ( shape ),0,1 );
  }
-
-  if (st == TopAbs_FACE)  {
+  else if (st == TopAbs_FACE)  {
    TopoDS_Face face = TopoDS::Face ( shape );
    if( BRep_Tool::NaturalRestriction( face ) ) {
      BRep_Builder aB;
      aB.NaturalRestriction( TopoDS::Face (  result ), Standard_True );
    }
  }
+  else if (st == TopAbs_WIRE || st == TopAbs_SHELL)
+    result.Closed (BRep_Tool::IsClosed (result));

  result.Orientation(orien);
-  result.Closed (BRep_Tool::IsClosed (result));
  myStatus = locStatus;
  Replace ( shape, result );

--- a/src/ChFi3d/ChFi3d_Builder_1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_1.cxx
@@ -545,9 +545,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
 	Ec = TopoDS::Edge(It.Value());
 	Standard_Boolean bonedge = !BRep_Tool::Degenerated(Ec);
 	if(bonedge){
-	  TopoDS_Vertex v1,v2;
-	  TopExp::Vertices(Ec,v1,v2);
-	  Standard_Boolean eclosed = v1.IsSame(v2);
+	  Standard_Boolean eclosed = BRep_Tool::IsClosed(Ec);
 	  Standard_Integer nboc = 0;
 	  for(j = 0; j <= i && bonedge; j++){ 
 	    if(!eclosed) bonedge = !Ec.IsSame(E[j]); 
--- a/src/IGESToBRep/IGESToBRep_BRepEntity.cxx
+++ b/src/IGESToBRep/IGESToBRep_BRepEntity.cxx
@@ -268,7 +268,7 @@ TopoDS_Shape IGESToBRep_BRepEntity::TransferEdge
 	    Standard_Real dist2f = p2.Distance ( pf );
 	    Standard_Real dist1l = p1.Distance ( pl );
 	    Standard_Real dist2l = p2.Distance ( pl );
-	    if ( E.Closed() || dist1f + dist2l <= dist1l + dist2f ) {
+	    if ( V1.IsSame(V2) || dist1f + dist2l <= dist1l + dist2f + Precision::Confusion() ) {
 	      //:77 if (BRepTools::Compare(V1, Vf)) //the part 'else' only if, in fact, edge should be reversed
 	      V1.Orientation(TopAbs_FORWARD);
 	      B.Add(E,V1);
--- a/src/LocOpe/LocOpe_SplitShape.cxx
+++ b/src/LocOpe/LocOpe_SplitShape.cxx
@@ -1233,7 +1233,9 @@ Standard_Boolean LocOpe_SplitShape::Rebuild(const TopoDS_Shape& S)
        B.Add(result,itr.Value().Oriented(orient));
      }
    }
-    result.Closed (BRep_Tool::IsClosed(result));
+    // Assign "Closed" flag for Wires and Shells only
+    if (result.ShapeType() == TopAbs_WIRE || result.ShapeType() == TopAbs_SHELL)
+      result.Closed (BRep_Tool::IsClosed(result));
    myMap(S).Append(result);
  }
  else {
--- a/src/QABugs/QABugs_19.cxx
+++ b/src/QABugs/QABugs_19.cxx
@@ -3126,6 +3126,31 @@ static Standard_Integer OCC25446 (Draw_Interpretor& theDI,
  return 0;
 }

+#include <ShapeFix_Edge.hxx>
+#include <TopoDS_Edge.hxx>
+
+static Standard_Integer OCC26640 (Draw_Interpretor& /*theDI*/, Standard_Integer /*theArgc*/, const char** theArgv)
+{
+  TopoDS_Face aFace = TopoDS::Face(DBRep::Get(theArgv[1]));
+
+  TopExp_Explorer anExp(aFace, TopAbs_EDGE);
+  const TopoDS_Edge& anEdg = TopoDS::Edge(anExp.Current());
+
+  Handle(ShapeBuild_ReShape) aContext = new ShapeBuild_ReShape;
+  const TopoDS_Shape& aResult = aContext->Apply(aFace);
+
+  ShapeFix_Edge sfe;
+
+  sfe.FixRemovePCurve(anEdg, aFace);
+  sfe.FixAddPCurve(anEdg, aFace, Standard_False);
+
+  aContext->Replace(aFace, aResult);
+
+  return 0;
+}
+
+
+
 void QABugs::Commands_19(Draw_Interpretor& theCommands) {
  const char *group = "QABugs";

@@ -3187,5 +3212,8 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) {
  theCommands.Add ("OCC25348", "OCC25348", __FILE__, OCC25348, group);
  theCommands.Add ("OCC25413", "OCC25413 shape", __FILE__, OCC25413, group);
  theCommands.Add ("OCC25446", "OCC25446 res b1 b2 op", __FILE__, OCC25446, group);
+
+  theCommands.Add ("OCC26640", "OCC26640 face", __FILE__, OCC26640, group);
+
  return;
 }
--- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
@@ -875,21 +875,53 @@ gp_Pnt2d ShapeAnalysis_Surface::NextValueOfUV(const gp_Pnt2d &p2dPrev,
  case GeomAbs_SurfaceOfRevolution :
  case GeomAbs_OffsetSurface :

-//    if ( ! mySurf->Continuity() == GeomAbs_C0 ) //: S4030: fix on BUC40132 8355 & PRO7978 1987: SI because of bad data
    {
+      if (surftype == GeomAbs_BSplineSurface)
+      {
+        Handle(Geom_BSplineSurface) aBSpline =  SurfAdapt.BSpline();
+
+        //Check near to knot position ~ near to C0 points on U isoline.
+        if ( SurfAdapt.UContinuity() == GeomAbs_C0 )
+        {
+          Standard_Integer aMinIndex = aBSpline->FirstUKnotIndex();
+          Standard_Integer aMaxIndex = aBSpline->LastUKnotIndex();
+          for (Standard_Integer anIdx = aMinIndex; anIdx <= aMaxIndex; ++anIdx)
+          {
+            Standard_Real aKnot = aBSpline->UKnot(anIdx);
+            if (Abs (aKnot - p2dPrev.X()) < Precision::Confusion())
+              return ValueOfUV ( P3D, preci );
+          }
+        }
+
+        //Check near to knot position ~ near to C0 points on U isoline.
+        if ( SurfAdapt.VContinuity() == GeomAbs_C0 )
+        {
+          Standard_Integer aMinIndex = aBSpline->FirstVKnotIndex();
+          Standard_Integer aMaxIndex = aBSpline->LastVKnotIndex();
+          for (Standard_Integer anIdx = aMinIndex; anIdx <= aMaxIndex; ++anIdx)
+          {
+            Standard_Real aKnot = aBSpline->VKnot(anIdx);
+            if (Abs (aKnot - p2dPrev.Y()) < Precision::Confusion())
+              return ValueOfUV ( P3D, preci );
+          }
+        }
+      }
+
      gp_Pnt2d sol;
      Standard_Boolean res = SurfaceNewton(p2dPrev,P3D,preci,sol);
-      if ( res ) {
-	Standard_Real gap = P3D.Distance ( Value(sol) );
-	if ( res ==2 || //:q6 abv 19 Mar 99: protect against strange attractors
-	     (maxpreci > 0. && gap - maxpreci > Precision::Confusion()) ) { //:q1: check with maxpreci
-	  Standard_Real U = sol.X(), V = sol.Y();
-	  myGap = UVFromIso ( P3D, preci, U, V );
-//	  gp_Pnt2d p = ValueOfUV ( P3D, preci );
-	  if ( gap >= myGap ) return gp_Pnt2d ( U, V );
-	}
-	myGap = gap;
-	return sol;
+      if ( res )
+      {
+        Standard_Real gap = P3D.Distance ( Value(sol) );
+        if ( res == 2 || //:q6 abv 19 Mar 99: protect against strange attractors
+          ( maxpreci > 0. && gap - maxpreci > Precision::Confusion()) ) 
+        { //:q1: check with maxpreci
+          Standard_Real U = sol.X(), V = sol.Y();
+          myGap = UVFromIso ( P3D, preci, U, V );
+          //	  gp_Pnt2d p = ValueOfUV ( P3D, preci );
+          if ( gap >= myGap ) return gp_Pnt2d ( U, V );
+        }
+        myGap = gap;
+        return sol;
      }
    }
    break;
--- a/src/ShapeBuild/ShapeBuild_ReShape.cxx
+++ b/src/ShapeBuild/ShapeBuild_ReShape.cxx
@@ -124,8 +124,9 @@ TopoDS_Shape ShapeBuild_ReShape::Apply (const TopoDS_Shape& shape,
    ShapeBuild_Edge sbe;
    sbe.CopyRanges ( TopoDS::Edge ( result ), TopoDS::Edge ( shape ));
  }
+  else if (st == TopAbs_WIRE || st == TopAbs_SHELL)
+    result.Closed (BRep_Tool::IsClosed (result));
  result.Orientation(orient);
-  result.Closed (BRep_Tool::IsClosed (result));
  myStatus = locStatus;
  Replace ( shape, result );

--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl
@@ -210,6 +210,18 @@ is
    	    	    	   pout      : out Array1OfReal from TColStd)
    returns Boolean is private;

+    getLine(me ;  points    : Array1OfPnt from TColgp;
+            params    : Array1OfReal from TColStd;
+            points2d: out Array1OfPnt2d from TColgp;
+            theTol : Real;
+            IsRecompute: in out Boolean) returns Curve from Geom2d is protected;
+    ---Purpose: Try to approximate 3D curve by Geom2d_Line 
+    --         or Geom2d_BsplineCurve with degree 1 with specified tolerance.
+    --         points - points obtained from 3d curve.
+    --         params - parameters corresponding points on 3d curves
+    --         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

 fields

--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
@@ -33,15 +33,22 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>

+#include <algorithm>
+
 #include <Precision.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt.hxx>
+#include <NCollection_Sequence.hxx>

 #include <GeomAPI_PointsToBSpline.hxx>
 #include <Geom2dAPI_Interpolate.hxx>
 #include <GeomAPI_Interpolate.hxx>
 #include <Geom2dAdaptor.hxx>
 #include <Geom2d_Line.hxx>
+#include <Geom2d_Circle.hxx>
+#include <Geom2d_Ellipse.hxx>
+#include <Geom2d_Hyperbola.hxx>
+#include <Geom2d_Parabola.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
@@ -191,7 +198,6 @@ static Standard_Integer NbSurfIntervals(const Handle(GeomAdaptor_HSurface)& GAS,
 //function : Perform
 //purpose  : 
 //=======================================================================
-
 Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curve)& c3d,
                                                                const Standard_Real First,
                                                                const Standard_Real Last,
@@ -208,7 +214,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
    myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_FAIL1);
    return Standard_False;
  }
-
 //  Projection Analytique
  Handle(Geom_Curve) crv3dtrim = c3d;
  if ( ! c3d->IsKind(STANDARD_TYPE(Geom_BoundedCurve)) )
@@ -252,15 +257,77 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
 //    $$$$    end :92 (big BSplineCurve C0)
  
  // this number should be "parametric dependent"
-  TColgp_Array1OfPnt   points(1, nbPini);
+  TColgp_Array1OfPnt points(1, nbPini);
  TColStd_Array1OfReal params(1, nbPini);
-
-  Standard_Integer iPnt;
+  NCollection_Sequence<Standard_Real> aKnotCoeffs;
  gp_Pnt p3d;
+  Standard_Integer iPnt;
+
+  // In case of bspline compute parametrization speed on each 
+  // knot interval inside [aFirstParam, aLastParam].
+  // If quotient = (MaxSpeed / MinSpeed) >= aMaxQuotientCoeff then
+  // use PerformByProjLib algorithm.
+  if(!bspl.IsNull())
+  {
+    Standard_Integer aNbIntPnts = NCONTROL;
+    Standard_Real aFirstParam = First; // First parameter of current interval.
+    Standard_Real aLastParam = Last; // Last parameter of current interval.
+
+    // First index computation.
+    Standard_Integer anIdx = 1;
+    for(; anIdx <= bspl->NbKnots() && aFirstParam < Last; anIdx++)
+    {
+      if(bspl->Knot(anIdx) > First)
+      {
+        break;
+      }
+    }
+
+    for(; anIdx <= bspl->NbKnots() && aFirstParam < Last; anIdx++)
+    {
+      // Fill current knot interval.
+      aLastParam = Min(Last, bspl->Knot(anIdx));
+      Standard_Real aStep = (aLastParam - aFirstParam) / (aNbIntPnts - 1);
+      Standard_Integer anIntIdx;
+      gp_Pnt p3d1, p3d2;
+      Standard_Real aLength3d = 0.0;
+      for(anIntIdx = 0; anIntIdx < aNbIntPnts - 1; anIntIdx++)
+      {
+        // Start filling from first point.
+        Standard_Real aParam1 = aFirstParam + aStep * anIntIdx;
+        Standard_Real aParam2 = aFirstParam + aStep * (anIntIdx + 1);
+        c3d->D0 (aParam1, p3d1);
+        c3d->D0 (aParam2, p3d2);
+        aLength3d += p3d2.Distance(p3d1);
+      }
+      aKnotCoeffs.Append(aLength3d / (aLastParam - aFirstParam));
+      aFirstParam = aLastParam;
+    }
+
+    Standard_Real anEvenlyCoeff = 0;
+    if (aKnotCoeffs.Size() > 0)
+    {
+      anEvenlyCoeff = *std::max_element(aKnotCoeffs.begin(), aKnotCoeffs.end()) / 
+                      *std::min_element(aKnotCoeffs.begin(), aKnotCoeffs.end());
+    }
+
+    const Standard_Real aMaxQuotientCoeff = 1500.0;
+    if (anEvenlyCoeff > aMaxQuotientCoeff)
+    {
+      PerformByProjLib(c3d, First, Last, c2d);
+      // PerformByProjLib fail detection:
+      if (!c2d.IsNull())
+      {
+        return Status (ShapeExtend_DONE);
+      }
+    }
+  }
+
  Standard_Real deltaT, t;
  deltaT = (Last - First) / (nbPini-1);
  nbrPnt = nbPini;
-  for (iPnt = 1; iPnt <= nbPini; iPnt ++) {
+  for (iPnt = 1; iPnt <= nbPini; iPnt ++)
+  {
    if      (iPnt == 1)      t = First;
    else if (iPnt == nbPini) t = Last;
    else                     t = First + (iPnt - 1) * deltaT;
@@ -270,8 +337,7 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
    params(iPnt) = t;
  }

-//  CALCUL par approximation
-
+  //  CALCUL par approximation
  TColgp_Array1OfPnt2d pnt2d(1, nbrPnt);
  ApproxPCurve (nbrPnt,points,params,pnt2d,c2d); //szv#4:S4163:12Mar99 OK not needed
  if (!c2d.IsNull()) {
@@ -307,7 +373,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
  c2d = InterpolatePCurve (nbPini, thePnts2d, theParams2d, c3d);
 //  c2d = ApproximatePCurve (nbPini, thePnts2d, theParams2d, c3d);
 //  Faut-il aussi reprendre la C3D ?
-
  myStatus |= ShapeExtend::EncodeStatus (c2d.IsNull() ? ShapeExtend_FAIL1 : ShapeExtend_DONE2);
  return Status (ShapeExtend_DONE);
 }
@@ -321,9 +386,9 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformByProjLib(Handle(G
 									const Standard_Real First,
 									const Standard_Real Last,
 									Handle(Geom2d_Curve)& c2d,
-									const GeomAbs_Shape continuity,
-									const Standard_Integer maxdeg,
-									const Standard_Integer nbinterval)
+									const GeomAbs_Shape /*continuity*/,
+									const Standard_Integer /*maxdeg */,
+									const Standard_Integer /*nbinterval */)
 {
  //Standard_Boolean OK = Standard_True; //szv#4:S4163:12Mar99 unused
  c2d.Nullify();
@@ -332,51 +397,53 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformByProjLib(Handle(G
    return Standard_False;
  }
   
-  try {
+  try
+  {
    OCC_CATCH_SIGNALS
    Handle(GeomAdaptor_HSurface) GAS = mySurf->Adaptor3d();
-    Standard_Real URes = GAS->ChangeSurface().UResolution ( myPreci );
-    Standard_Real VRes = GAS->ChangeSurface().VResolution ( myPreci );
    Handle(GeomAdaptor_HCurve) GAC = new GeomAdaptor_HCurve (c3d,First,Last);
-    ProjLib_CompProjectedCurve Projector ( GAS, GAC, URes, VRes );
+    ProjLib_ProjectedCurve Projector(GAS, GAC);

-    Standard_Real ubeg, ufin;
-    Standard_Integer nbSol = Projector.NbCurves();
-    if (nbSol==1) {
-      Projector.Bounds(1, ubeg, ufin);
-      if((ubeg<=First)&&(ufin>=Last)) {
-	Standard_Integer nbintervals = ( nbinterval < 1 ? 
-					NbSurfIntervals(GAS, GeomAbs_C3)+GAC->NbIntervals(GeomAbs_C3)+2:
-					nbinterval);
-	Handle(ProjLib_HCompProjectedCurve) HProjector = new ProjLib_HCompProjectedCurve();
-	HProjector->Set(Projector);
-	Handle(Adaptor2d_HCurve2d) HPCur = HProjector;
-	Approx_CurveOnSurface appr(HPCur, GAS, First, Last, myPreci,
-				   continuity, maxdeg,
-				   nbintervals,
-				   Standard_False, Standard_True);
-	if ( appr.IsDone() )
-	  c2d = appr.Curve2d();
-      }
-#ifdef OCCT_DEBUG
-      else
-	cout<<"Warning: ProjLib cutting pcurve "<< First << " -> " << ubeg <<" ; "<< Last << " -> " << ufin << endl;
-#endif     
+    switch (Projector.GetType())
+    {
+    case GeomAbs_Line : 
+      c2d = new Geom2d_Line(Projector.Line()); 
+      break;
+    case GeomAbs_Circle : 
+      c2d = new Geom2d_Circle(Projector.Circle());
+      break;
+    case GeomAbs_Ellipse :
+      c2d = new Geom2d_Ellipse(Projector.Ellipse());
+      break;
+    case GeomAbs_Parabola : 
+      c2d = new Geom2d_Parabola(Projector.Parabola()); 
+      break;
+    case GeomAbs_Hyperbola : 
+      c2d = new Geom2d_Hyperbola(Projector.Hyperbola()); 
+      break;
+    case GeomAbs_BSplineCurve :
+      c2d = Projector.BSpline();
+      break;
+    case GeomAbs_BezierCurve :
+    case GeomAbs_OtherCurve :
+      // Not possible, handling added to avoid gcc warning.
+      break;
    }
-#ifdef OCCT_DEBUG
-    else cout<<"Warning: ProjLib "<< nbSol << " curves in ProjLib"<<endl;
-#endif
-    if(c2d.IsNull()) {
+
+    if(c2d.IsNull())
+    {
      myStatus = ShapeExtend::EncodeStatus (ShapeExtend_FAIL2);
      return Standard_False;
    }
-    else {
+    else 
+    {
      myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1);
      return Standard_True;
    }
    
  }
-  catch(Standard_Failure) {
+  catch(Standard_Failure)
+  {
 #ifdef OCCT_DEBUG
    cout << "Warning: ShapeConstruct_ProjectCurveOnSurface::PerformByProjLib(): Exception: ";
    Standard_Failure::Caught()->Print(cout); cout << endl;
@@ -463,19 +530,211 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
  return result;
 }

+ //! 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_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; 
+     }
+   }
+
+   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);
+   }
+
+   // 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;
+   }
+
+   // 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;
+   }
+
+   return Standard_True;
+ }
+
+//=======================================================================
+//function : getLine
+//purpose  : 
+//=======================================================================
+
+ Handle(Geom2d_Curve) ShapeConstruct_ProjectCurveOnSurface::getLine(
+   const TColgp_Array1OfPnt& thepoints,
+   const TColStd_Array1OfReal& theparams,
+   TColgp_Array1OfPnt2d& thePnt2ds,
+   Standard_Real theTol,
+   Standard_Boolean &isRecompute) const 
+ {
+   Standard_Integer nb =  thepoints.Length();
+   gp_Pnt aP[4];
+   aP[0] = thepoints(1);
+   aP[1] = thepoints(2);
+   aP[2] = thepoints(nb - 1);
+   aP[3] = thepoints(nb);
+   gp_Pnt2d aP2d[4];
+   Standard_Integer i = 0;
+
+   Standard_Real aTol2 = theTol * theTol;
+   Standard_Boolean isPeriodicU = mySurf->Surface()->IsUPeriodic();
+   Standard_Boolean isPeriodicV = mySurf->Surface()->IsVPeriodic();
+
+   // Workaround:
+   // Protection against bad "tolerance" shapes.
+   if (aTol2 > 1.0)
+   {
+     theTol = Precision::Confusion();
+     aTol2 = theTol * theTol;
+   }
+   Standard_Real anOldTol2 = aTol2;
+
+   // project first and last points
+   for( ; i < 4; i +=3)
+   {
+     Standard_Integer j;
+     for ( j=0; j < myNbCashe; j++ ) 
+       if ( myCashe3d[j].SquareDistance (aP[i] ) < aTol2)
+       {
+         aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, 
+           theTol);
+         break;
+       }
+       if ( j >= myNbCashe )
+         aP2d[i] = mySurf->ValueOfUV(aP[i], theTol);
+
+       Standard_Real aDist = mySurf->Gap();
+       Standard_Real aCurDist = aDist * aDist;
+       if( aTol2 < aDist * aDist)
+         aTol2 = aCurDist;
+   }
+
+   if ( isPeriodicU || isPeriodicV )
+   {
+     // Compute second and last but one c2d points.
+     for(i = 1; i < 3; i++)
+     {
+       Standard_Integer j;
+       for ( j=0; j < myNbCashe; j++ ) 
+         if ( myCashe3d[j].SquareDistance (aP[i] ) < aTol2)
+         {
+           aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, theTol);
+           break;
+         }
+         if ( j >= myNbCashe )
+           aP2d[i] = mySurf->ValueOfUV(aP[i], theTol);
+
+         Standard_Real aDist = mySurf->Gap();
+         Standard_Real aCurDist = aDist * aDist;
+         if( aTol2 < aDist * aDist)
+           aTol2 = aCurDist;
+     }
+
+     if (isPeriodicU)
+     {
+       isRecompute = fixPeriodictyTroubles(&aP2d[0], 1 /* X Coord */, mySurf->Surface()->UPeriod());
+     }
+
+     if (isPeriodicV)
+     {
+       isRecompute = fixPeriodictyTroubles(&aP2d[0], 2 /* Y Coord */, mySurf->Surface()->VPeriod());
+     }
+   }
+
+   thePnt2ds.SetValue(1, aP2d[0]);
+   thePnt2ds.SetValue(nb, aP2d[3]);
+
+   // Restore old tolerance in 2d space to avoid big gap cases.
+   aTol2 = anOldTol2;
+   // Check that straight line in 2d with parameterisation as in 3d will fit 
+   // fit 3d curve at all points.
+   Standard_Real dPar = theparams(nb) - theparams(1);
+   if ( Abs(dPar) < Precision::PConfusion() )
+     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;
+   }
+
+   // check if pcurve can be represented by Geom2d_Line (parameterised by length)
+   Standard_Real aLLength = aVec0.Magnitude();
+   if ( Abs (aLLength - dPar) <= Precision::PConfusion() )
+   {
+     gp_XY aDirL = aVec0.XY() / aLLength;
+     gp_Pnt2d aPL (aP2d[0].XY() - theparams(1) * aDirL);
+     return new Geom2d_Line (aPL, gp_Dir2d(aDirL));
+   }
+
+   // create straight bspline
+   TColgp_Array1OfPnt2d aPoles(1, 2);
+   aPoles(1) = aP2d[0];
+   aPoles(2) = aP2d[3];
+
+   TColStd_Array1OfReal aKnots(1,2);
+   aKnots(1) = theparams(1);
+   aKnots(2) = theparams(theparams.Length());
+
+   TColStd_Array1OfInteger aMults(1,2);
+   aMults(1) = 2;
+   aMults(2) = 2;
+   Standard_Integer aDegree = 1;
+   Handle(Geom2d_BSplineCurve) abspl2d =
+     new Geom2d_BSplineCurve (aPoles, aKnots, aMults, aDegree);
+   return abspl2d;
+ }
+
 //=======================================================================
 //function : ApproxPCurve
 //purpose  : 
 //=======================================================================

- Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::ApproxPCurve(const Standard_Integer nbrPnt,
+  Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::ApproxPCurve(const Standard_Integer nbrPnt,
 								     const TColgp_Array1OfPnt& points,
 								     const TColStd_Array1OfReal& params,
 								     TColgp_Array1OfPnt2d& pnt2d,
 								     Handle(Geom2d_Curve)& c2d) 
 {
-  Standard_Boolean isDone = Standard_True;
-  
+  // for performance, first try to handle typical case when pcurve is straight
+  Standard_Boolean isRecompute = Standard_False;
+  c2d = getLine(points, params, pnt2d, myPreci, isRecompute);
+  if(!c2d.IsNull())
+  {
+    return Standard_True;
+  }
+    Standard_Boolean isDone = Standard_True;
  // test if the curve 3d is a boundary of the surface 
  // (only for Bezier or BSpline surface)
  
@@ -628,17 +887,29 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
      if     ( (i == 1)      && p1OnIso)  p2d = valueP1;
      else if( (i == nbrPnt) && p2OnIso)  p2d = valueP2;
      else  {// general case (not an iso)  mais attention aux singularites !
-	if ( ii==1 ) {
-	  //:q9 abv 23 Mar 99: use cashe as 1st approach
-	  Standard_Integer j; // svv #1
-	  for ( j=0; j < myNbCashe; j++ ) 
-	    if ( myCashe3d[j].SquareDistance ( p3d ) < myPreci*myPreci ) {
-	      p2d = mySurf->NextValueOfUV (myCashe2d[j], p3d, myPreci, 
-					   Precision::Confusion()+gap);
-	      break;
-	    }
-	  if ( j >= myNbCashe ) p2d = mySurf->ValueOfUV(p3d, myPreci); 
-	}
+        // first and last points are already computed by getLine()
+        if ( (i == 1 || i == nbrPnt))
+        {
+          if (!isRecompute)
+          {
+            p2d = pnt2d(i);
+            gap = mySurf->Gap();
+            continue;
+          }
+          else
+          {
+            //:q9 abv 23 Mar 99: use cashe as 1st approach
+            Standard_Integer j; // svv #1
+            for ( j=0; j < myNbCashe; j++ ) 
+              if ( myCashe3d[j].SquareDistance ( p3d ) < myPreci*myPreci )
+              {
+                p2d = mySurf->NextValueOfUV (myCashe2d[j], p3d, myPreci, 
+                  Precision::Confusion()+gap);
+                break;
+              }
+              if ( j >= myNbCashe ) p2d = mySurf->ValueOfUV(p3d, myPreci);
+          }
+        }
        else {
          p2d = mySurf->NextValueOfUV (p2d, p3d, myPreci, //:S4030: optimizing
                                       Precision::Confusion()+1000*gap); //:q1
@@ -964,21 +1235,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
    myCashe2d[1] = pnt2d(1);
    myCashe2d[0] = pnt2d(nbrPnt);
  }
-  
-  if (isoParam && isoPar2d3d) {
-    
-    // create directly isoparametrics (PCurve)
-    
-    gp_Vec2d aVec2d(valueP1, valueP2);
-    gp_Dir2d aDir2d(aVec2d);
-    gp_Pnt2d P0;
-    
-    if (isoTypeU) P0.SetCoord(valueP1.X(), valueP1.Y() - params(1)*aDir2d.Y());
-    else          P0.SetCoord(valueP1.X() - params(1)*aDir2d.X(), valueP1.Y());
-    
-    c2d = new Geom2d_Line(P0, aDir2d);
-  }
-
  return isDone;
 }

@@ -1432,7 +1688,7 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons
    if (mp[0] > 0 && 
 	( ! p1OnIso || currd2[0] < mind2[0] ) ) {
      p1OnIso = Standard_True;
-      mind2[0] = currd2[0];
+      mind2[0] = currd2[0]; // LP2.stp #105899: FLT_INVALID_OPERATION on Windows 7 VC 9 Release mode on the whole file 
      if (isoU) valueP1.SetCoord(isoVal, tp[0]);
      else      valueP1.SetCoord(tp[0], isoVal);
    }
--- a/src/ShapeFix/ShapeFix_Edge.cxx
+++ b/src/ShapeFix/ShapeFix_Edge.cxx
@@ -314,41 +314,6 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf,
  return aC2d;
 }

-//=======================================================================
-//static : Range3d 
-//purpose  : contournement du Range de BRep_Builder pour ne pas affecter
-//           les ranges des pcurves.
-//=======================================================================
-
-static void Range3d (const TopoDS_Edge& E, 
-		     const Standard_Real First, const Standard_Real Last,
-		     const Standard_Real myPrecision) 
-{
-  //  set the range to all the representations
-  const Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &E.TShape());
-  
-  BRep_ListOfCurveRepresentation& lcr = TE->ChangeCurves();
-  BRep_ListIteratorOfListOfCurveRepresentation itcr(lcr);
-  Handle(BRep_GCurve) GC;
-  
-  while (itcr.More()) {
-    GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if (!GC.IsNull()) {
-      if (GC->IsCurve3D()) {
-	GC->SetRange(First,Last);
-	// Set the closedness flag to the correct value.
-	Handle(Geom_Curve) C = GC->Curve3D();
-	if ( !C.IsNull() ) {
-	  Standard_Boolean closed = C->Value(First).IsEqual(C->Value(Last),myPrecision);
-	  TE->Closed(closed);
-	}
-      }
-    }
-    itcr.Next();
-  }
-
-  TE->Modified(Standard_True);
-}
 //=======================================================================
 //function : SameRange (Temp)
 //purpose  : 
@@ -526,18 +491,6 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge,

 //    step = 2;

-    // adding by skl 28.03.2003 for usung Line instead of BSpline
-    Standard_Real fp=0.,lp=0.;
-    Standard_Boolean isLine=Standard_False;
-    if(c2d->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) {
-      Handle(Geom2d_TrimmedCurve) tc = Handle(Geom2d_TrimmedCurve)::DownCast(c2d);
-      if(tc->BasisCurve()->IsKind(STANDARD_TYPE(Geom2d_Line))) {
-        fp = tc->FirstParameter();
-        lp = tc->LastParameter();
-        isLine = Standard_True;
-      }
-    }
-
    if (isSeam) {
      // On ne sait pas laquelle est Forward. Au PIF. La geometrie Forward
      // sera mise a jour dans ComputeWire
@@ -573,19 +526,13 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge,
      B.UpdateEdge (edge,c2d,surf,location, 0.); //#82 rln 16.03.99: preci
    }

-    if ( isLine ) {
-      B.Range(edge,surf,location,fp,lp);
-      B.SameParameter(edge,Standard_False);
-      B.SameRange(edge,Standard_False);
-    }
-
    //  Conclusion
 //    step = 3;
    if ( myProjector->Status ( ShapeExtend_DONE3 ) ) {
      Standard_Real G3dCFirst = c3d->FirstParameter();
      Standard_Real G3dCLast  = c3d->LastParameter();
      B.UpdateEdge(edge, c3d, 0.);
-      Range3d(edge, G3dCFirst, G3dCLast, 0.);
+      B.Range(edge, G3dCFirst, G3dCLast, Standard_True);
    }
  }   // end try
  catch(Standard_Failure) {
--- a/src/ShapeFix/ShapeFix_Solid.cxx
+++ b/src/ShapeFix/ShapeFix_Solid.cxx
@@ -432,18 +432,16 @@ Standard_Boolean ShapeFix_Solid::Perform(const Handle(Message_ProgressIndicator)
    }
      
    if(isClosed || myCreateOpenSolidMode) {
-      if(BRep_Tool::IsClosed(tmpShape)) {
-        TopoDS_Iterator itersh(tmpShape);
-        TopoDS_Shell aShell;
-        if(itersh.More() && itersh.Value().ShapeType() == TopAbs_SHELL)
-          aShell = TopoDS::Shell(itersh.Value());
-        if(!aShell.IsNull()) {
-          TopoDS_Solid aSol = SolidFromShell(aShell);
-          if(ShapeExtend::DecodeStatus(myStatus,ShapeExtend_DONE2)) {
-            SendWarning (Message_Msg ("FixAdvSolid.FixOrientation.MSG20"));// Orientaion of shell was corrected.
-            Context()->Replace(tmpShape,aSol);
-            tmpShape = aSol;
-          }
+      TopoDS_Iterator itersh(tmpShape);
+      TopoDS_Shell aShell;
+      if(itersh.More() && itersh.Value().ShapeType() == TopAbs_SHELL)
+        aShell = TopoDS::Shell(itersh.Value());
+      if(!aShell.IsNull()) {
+        TopoDS_Solid aSol = SolidFromShell(aShell);
+        if(ShapeExtend::DecodeStatus(myStatus,ShapeExtend_DONE2)) {
+          SendWarning (Message_Msg ("FixAdvSolid.FixOrientation.MSG20"));// Orientaion of shell was corrected.
+          Context()->Replace(tmpShape,aSol);
+          tmpShape = aSol;
        }
      }
      mySolid  = TopoDS::Solid(tmpShape);
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
@@ -210,7 +210,8 @@ static void RecModif (const TopoDS_Shape &S,
      }
      if ( modif )
      {
-        result.Closed (BRep_Tool::IsClosed (result));
+        if (result.ShapeType() == TopAbs_WIRE || result.ShapeType() == TopAbs_SHELL)
+          result.Closed (BRep_Tool::IsClosed (result));
        res = result;
      }
    }
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
@@ -97,7 +97,8 @@ ShapeUpgrade_FaceDivideArea::ShapeUpgrade_FaceDivideArea(const TopoDS_Face& F)
  }
  if(isModified)
  {
-    aCopyRes.Closed (BRep_Tool::IsClosed (aCopyRes));
+    if (aCopyRes.ShapeType() == TopAbs_WIRE || aCopyRes.ShapeType() == TopAbs_SHELL)
+      aCopyRes.Closed (BRep_Tool::IsClosed (aCopyRes));
    Context()->Replace(aResult,aCopyRes);
  }
  myStatus |= aStatus;  
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cxx
@@ -1795,7 +1795,7 @@ Standard_Integer TopOpeBRepBuild_Builder1::IsSame2d (const TopTools_SequenceOfSh
  if (!(aBAS.IsUPeriodic() || aBAS.IsVPeriodic())) return 1;

  //we process here only fully closed edges (Vf == Vl)
-  if(!anEdgeObj.Closed() || !anEdgeTool.Closed())
+  if(!BRep_Tool::IsClosed(anEdgeObj) || !BRep_Tool::IsClosed(anEdgeTool))
    return 1;
  
  Standard_Real f = 0., l = 0., tolpc = 0. ,  
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_1.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_1.cxx
@@ -553,8 +553,6 @@ void TopOpeBRepBuild_Builder1::Destroy()
 	  Vl = TopoDS::Vertex(myDataStructure->Shape(iref));
 	  Vl.Orientation(TopAbs_REVERSED);
 	}
-	Standard_Boolean bitclosed = Vf.IsSame(Vl);
-	aNewEdge.Closed(bitclosed);
      
 	myBuildTool.AddEdgeVertex (aNewEdge, Vf);
 	myBuildTool.Parameter     (aNewEdge, Vf, ParF);
@@ -842,9 +840,6 @@ void TopOpeBRepBuild_Builder1::Destroy()
    TopoDS_Edge aNewEdge;
    myBuildTool.CopyEdge (EdgeF, aNewEdge);

-    Standard_Boolean bitclosed = aV1.IsSame(aV2);
-    aNewEdge.Closed(bitclosed);
-
    myBuildTool.AddEdgeVertex (aNewEdge, aV1);
    myBuildTool.Parameter     (aNewEdge, aV1, aPar1);
    
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_2.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_2.cxx
@@ -152,7 +152,6 @@ Standard_Integer TopOpeBRepBuild_Builder1::CorrectResult2d(TopoDS_Shape& aResult
    aShell.Closed (BRep_Tool::IsClosed(aShell));
    BB.Add (aSolid, aShell);
  }
-  aSolid.Closed (BRep_Tool::IsClosed(aSolid));
  aResult=aSolid;

  //update section curves 
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx
@@ -145,7 +145,7 @@ Standard_Integer FUN_AnalyzemapVon1E(const TopTools_IndexedDataMapOfShapeShape&
  }
  else if (nV == 1) {
    const TopoDS_Shape& E = mapVon1E.FindFromIndex(1);
-    Standard_Boolean Eclosed = E.Closed();
+    Standard_Boolean Eclosed = BRep_Tool::IsClosed(E);
    Standard_Boolean dgE = BRep_Tool::Degenerated(TopoDS::Edge(E));
    if      (dgE)     res = ISVERTEX;
    else if (Eclosed) res = CLOSEDW;
@@ -319,7 +319,7 @@ void TopOpeBRepBuild_FaceBuilder::DetectUnclosedWire(TopTools_IndexedDataMapOfSh
            {
              const TopoDS_Edge &E = TopoDS::Edge (itE.Value());
              Standard_Integer I = myBlockBuilder.Element(E);
-              if (!E.Closed() && myBlockBuilder.ElementIsValid(I))
+              if (!BRep_Tool::IsClosed(E) && myBlockBuilder.ElementIsValid(I))
              {
                TopoDS_Vertex Vf,Vl;
                TopExp::Vertices (E, Vf, Vl);
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx
@@ -150,11 +150,6 @@ void TopOpeBRepBuild_Builder::GEDBUMakeEdges
    } // EDBUloop.InitVertex :  on vertices of new edge newEdge
    
    Standard_Boolean addedge = (nVF == 1 && nVR == 1);
-    Standard_Boolean bitclosed = Standard_False;
-    if (nVF == 1 && nVR == 1) {
-      bitclosed = VF.IsSame(VR);
-      newEdge.Closed(bitclosed);
-    }
    if (addedge) {
      if (tosplit) {
 	TopTools_ListOfShape loe; Standard_Boolean ok = TopOpeBRepTool_TOOL::SplitE(TopoDS::Edge(newEdge),loe);
--- a/src/TopoDS/TopoDS_TShape.cdl
+++ b/src/TopoDS/TopoDS_TShape.cdl
@@ -34,7 +34,7 @@ deferred class TShape from TopoDS inherits TShared from MMgt
 	--           - Modified   : Has been modified.
 	--           - Checked    : Has been checked.
 	--           - Orientable : Can be oriented.
-	--           - Closed     : Is closed.
+	--           - Closed     : Is closed (note that only Wires and Shells may be closed).
 	--           - Infinite   : Is infinite.
 	--           - Convex     : Is convex.
 	--       
--- a/tests/bugs/heal/bug17129
+++ b/tests/bugs/heal/bug17129
@@ -0,0 +1,18 @@
+puts "============"
+puts "OCC17129"
+puts "============"
+puts ""
+#######################################################################
+# ShapeFix projector makes 2d curves with oscillations
+#######################################################################
+
+restore [locate_data_file bug17129_ff_1285_proj.brep] a
+fixshape r a
+
+pcurve r
+
+#v2d2
+view 1 -2D-  728 20 400 400
+
+2dfit
+set only_screen_axo 1
--- a/tests/bugs/heal/bug210
+++ b/tests/bugs/heal/bug210
@@ -5,6 +5,7 @@ puts ""
 ##################################################
 # Improve FixShape to correct case of touching wires
 ##################################################
+puts "TODO CR22598 ALL: Faulty shapes in variables faulty_1 to faulty_" 

 pload XDE

--- a/tests/bugs/modalg_2/bug22631
+++ b/tests/bugs/modalg_2/bug22631
@@ -15,14 +15,14 @@ testreadstep [locate_data_file OCC22145.stp] result
 set square 205444

 set nb_v_good 3344
-set nb_e_good 4685
+set nb_e_good 4679
 set nb_w_good 1943
 set nb_f_good 1943
 set nb_sh_good 1
 set nb_sol_good 1
 set nb_compsol_good 0
 set nb_compound_good 2
-set nb_shape_good 11919
+set nb_shape_good 11913

 vinit
 tclean result
--- a/tests/bugs/moddata_3/bug25202_1
+++ b/tests/bugs/moddata_3/bug25202_1
@@ -24,7 +24,7 @@ explode b f
 OCC25202 result b 1 ff1 3 ff2

 set info [whatis result]
-if { [regexp {Closed} ${info}] } {
+if { [regexp {Closed} ${info}] != 1 } {
    puts "OK : value of IsClosed flag is correct"
 } else {
    puts "Error : value of IsClosed flag is not correct"
--- a/tests/bugs/moddata_3/bug25202_3
+++ b/tests/bugs/moddata_3/bug25202_3
@@ -12,7 +12,7 @@ mkface ff pp
 prism result ff 0 0 20

 set info [whatis result]
-if { [regexp {Closed} ${info}] } {
+if { [regexp {Closed} ${info}] != 1 } {
    puts "OK : value of IsClosed flag is correct"
 } else {
    puts "Error : value of IsClosed flag is not correct"
--- a/tests/bugs/moddata_3/bug25202_4
+++ b/tests/bugs/moddata_3/bug25202_4
@@ -13,7 +13,7 @@ mkplane ff ww
 revol result ff 0 0 0 1 0 0 90

 set info [whatis result]
-if { [regexp {Closed} ${info}] } {
+if { [regexp {Closed} ${info}] != 1 } {
    puts "OK : value of IsClosed flag is correct"
 } else {
    puts "Error : value of IsClosed flag is not correct"
--- a/tests/de/iges_1/B4
+++ b/tests/de/iges_1/B4
@@ -7,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 169  ( 430 )  Summary  = 169  ( 430 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   Summary  = 9628  ( 9625 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   Summary  = 9627  ( 9625 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   FreeWire = 0  ( 0 )   FreeEdge  = 28 ( 28 )   SharedEdge = 4104  ( 4104 )
-TOLERANCE   : MaxTol   =    0.483503583  (   0.4835035831 )  AvgTol   =   0.00204387873  (  0.002030701378 )
+TOLERANCE   : MaxTol   =    0.483503583  (   0.4835035831 )  AvgTol   =   0.00303544578  (  0.003024564929 )
 LABELS      : N0Labels = 702  ( 702 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 702  ( 702 )   NameLabels = 702  ( 702 )   ColorLabels = 16  ( 16 )   LayerLabels = 702  ( 702 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/iges_1/D7
+++ b/tests/de/iges_1/D7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 129  ( 71 )  Summary  = 129  ( 71
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 180  ( 180 )   Summary  = 2185  ( 1096 )
 STATSHAPE   : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 180  ( 180 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 912  ( 457 )
-TOLERANCE   : MaxTol   =  0.02358959588  (  0.02358723715 )  AvgTol   =  0.0007627425938  (  0.001634419614 )
+TOLERANCE   : MaxTol   =  0.04953179108  (  0.04952733504 )  AvgTol   =  0.005022224409  (  0.01224482043 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 180  ( 180 )  N2Labels = 0  ( 0 )   TotalLabels = 181  ( 181 )   NameLabels = 181  ( 181 )   ColorLabels = 180  ( 180 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/iges_1/J6
+++ b/tests/de/iges_1/J6
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 156  ( 818 )  Summary  = 156  ( 818 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   Summary  = 4898  ( 4898 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 2170  ( 2170 )
-TOLERANCE   : MaxTol   =   0.8210384396  (    0.821038439 )  AvgTol   =  0.006791053813  (   0.00686200517 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   Summary  = 4886  ( 4886 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 2158  ( 2158 )
+TOLERANCE   : MaxTol   =   0.8210384396  (    0.821038439 )  AvgTol   =  0.008238191769  (  0.008314230694 )
 LABELS      : N0Labels = 289  ( 289 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 289  ( 289 )   NameLabels = 289  ( 289 )   ColorLabels = 101  ( 101 )   LayerLabels = 288  ( 288 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 8 )
--- a/tests/de/iges_1/L1
+++ b/tests/de/iges_1/L1
@@ -8,8 +8,8 @@ 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  = 1161  ( 1155 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 90  ( 90 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 502  ( 496 )
+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 )
 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 )
--- a/tests/de/iges_1/L4
+++ b/tests/de/iges_1/L4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 62 )  Summary  = 18  ( 62 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 230  ( 230 )   Summary  = 2910  ( 2906 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 230  ( 230 )   FreeWire = 1  ( 1 )   FreeEdge  = 63 ( 63 )   SharedEdge = 1195  ( 1193 )
-TOLERANCE   : MaxTol   =  0.06012224669  (   0.1346852729 )  AvgTol   =  0.001230721372  (  0.001407061098 )
+TOLERANCE   : MaxTol   =  0.06012224669  (   0.1346852729 )  AvgTol   =  0.001347528763  (  0.001523930617 )
 LABELS      : N0Labels = 292  ( 292 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 292  ( 292 )   NameLabels = 292  ( 292 )   ColorLabels = 291  ( 292 )   LayerLabels = 247  ( 248 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
--- a/tests/de/iges_1/L5
+++ b/tests/de/iges_1/L5
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 146  ( 887 )  Summary  = 146  ( 88
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 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.01205458838  (  0.01098786532 )  AvgTol   =  6.578043174e-005  (  6.481652011e-005 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/iges_1/L9
+++ b/tests/de/iges_1/L9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 347  ( 691 )  Summary  = 347  ( 69
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2297  ( 2297 )   Summary  = 26114  ( 26114 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2297  ( 2297 )   FreeWire = 0  ( 0 )   FreeEdge  = 22 ( 22 )   SharedEdge = 10774  ( 10774 )
-TOLERANCE   : MaxTol   =   0.2778575821  (   0.2778575802 )  AvgTol   =  0.0007983843446  (  0.0007904430744 )
+TOLERANCE   : MaxTol   =   0.2778575821  (   0.2778575802 )  AvgTol   =   0.00113643717  (  0.001128576508 )
 LABELS      : N0Labels = 2329  ( 2329 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2329  ( 2329 )   NameLabels = 2329  ( 2329 )   ColorLabels = 2319  ( 2329 )   LayerLabels = 2319  ( 2329 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
--- a/tests/de/iges_1/N9
+++ b/tests/de/iges_1/N9
@@ -8,8 +8,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 183 )  Summary  = 3  ( 183 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   Summary  = 2690  ( 2687 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1244  ( 1243 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   Summary  = 2688  ( 2687 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1243  ( 1243 )
 TOLERANCE   : MaxTol   = 0.009955692634  ( 0.009955692464 )  AvgTol   =  0.0008509893784  (  0.0008531522552 )
 LABELS      : N0Labels = 97  ( 97 )  N1Labels = 2  ( 102 )  N2Labels = 0  ( 0 )   TotalLabels = 99  ( 199 )   NameLabels = 97  ( 97 )   ColorLabels = 98  ( 199 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_1/O2
+++ b/tests/de/iges_1/O2
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 485 )  Summary  = 12  ( 485
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 239  ( 239 )   Summary  = 4786  ( 4768 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 239  ( 239 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2151  ( 2144 )
-TOLERANCE   : MaxTol   = 0.0006563832817  ( 0.0006563832817 )  AvgTol   =  2.900975685e-005  (  2.941852737e-005 )
+TOLERANCE   : MaxTol   = 0.0009886042946  ( 0.0009885051926 )  AvgTol   =  5.777641061e-005  (  5.821884006e-005 )
 LABELS      : N0Labels = 237  ( 237 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 237  ( 237 )   NameLabels = 237  ( 237 )   ColorLabels = 0  ( 0 )   LayerLabels = 236  ( 237 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
--- a/tests/de/iges_1/O3
+++ b/tests/de/iges_1/O3
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 68  ( 594 )  Summary  = 68  ( 594
 CHECKSHAPE  : Wires    = 1  ( 3 )  Faces    = 1  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 457  ( 457 )   Summary  = 10476  ( 10473 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 457  ( 457 )   FreeWire = 26  ( 26 )   FreeEdge  = 1283 ( 1283 )   SharedEdge = 4133  ( 4130 )
-TOLERANCE   : MaxTol   =   0.9875148267  (     0.98741607 )  AvgTol   =   0.01634290864  (   0.01654218425 )
+TOLERANCE   : MaxTol   =   0.9875148267  (     0.98741607 )  AvgTol   =    0.0166905215  (   0.01689161447 )
 LABELS      : N0Labels = 1706  ( 1706 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1706  ( 1706 )   NameLabels = 1706  ( 1706 )   ColorLabels = 1680  ( 1706 )   LayerLabels = 1680  ( 1706 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
--- a/tests/de/iges_1/P4
+++ b/tests/de/iges_1/P4
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 88  ( 75 )  Summary  = 88  ( 75 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 320  ( 320 )   Summary  = 4995  ( 4896 )
 STATSHAPE   : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 320  ( 320 )   FreeWire = 0  ( 0 )   FreeEdge  = 218 ( 218 )   SharedEdge = 2066  ( 2024 )
-TOLERANCE   : MaxTol   =   0.9408369253  (    1.136317349 )  AvgTol   =    0.0339705896  (   0.03797247772 )
+TOLERANCE   : MaxTol   =   0.9408369253  (    1.136317349 )  AvgTol   =   0.03468777686  (   0.04030133427 )
 LABELS      : N0Labels = 521  ( 521 )  N1Labels = 18  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 539  ( 521 )   NameLabels = 521  ( 521 )   ColorLabels = 537  ( 521 )   LayerLabels = 455  ( 439 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
--- a/tests/de/iges_1/P5
+++ b/tests/de/iges_1/P5
@@ -7,11 +7,11 @@ set filename brazo1.igs
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 144  ( 455 )  Summary  = 144  ( 455 )
-CHECKSHAPE  : Wires    = 5  ( 7 )  Faces    = 6  ( 7 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 228  ( 228 )   Summary  = 4666  ( 4567 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 228  ( 228 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2127  ( 2073 )
+CHECKSHAPE  : Wires    = 6  ( 8 )  Faces    = 6  ( 8 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 )   Summary  = 4688  ( 4576 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2156  ( 2092 )
 TOLERANCE   : MaxTol   =    0.991254355  (    0.991254355 )  AvgTol   =    0.0113074551  (   0.01224298461 )
-LABELS      : N0Labels = 223  ( 223 )  N1Labels = 6  ( 301 )  N2Labels = 0  ( 0 )   TotalLabels = 229  ( 524 )   NameLabels = 223  ( 387 )   ColorLabels = 228  ( 524 )   LayerLabels = 228  ( 524 )
+LABELS      : N0Labels = 223  ( 223 )  N1Labels = 0  ( 256 )  N2Labels = 0  ( 0 )   TotalLabels = 223  ( 479 )   NameLabels = 223  ( 388 )   ColorLabels = 223  ( 479 )   LayerLabels = 223  ( 479 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
 COLORS      : Colors   = BLUE1 MAGENTA1 YELLOW  ( BLUE1 MAGENTA1 YELLOW )
--- a/tests/de/iges_1/P9
+++ b/tests/de/iges_1/P9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 38  ( 183 )  Summary  = 38  ( 183
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   Summary  = 2511  ( 2510 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   FreeWire = 23  ( 23 )   FreeEdge  = 331 ( 331 )   SharedEdge = 983  ( 983 )
-TOLERANCE   : MaxTol   =   0.1829958579  (   0.1829958769 )  AvgTol   =  0.002970769325  (  0.003040791402 )
+TOLERANCE   : MaxTol   =   0.1829958579  (   0.1829958769 )  AvgTol   =  0.003259834421  (  0.003329232309 )
 LABELS      : N0Labels = 412  ( 412 )  N1Labels = 2  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 414  ( 412 )   NameLabels = 412  ( 412 )   ColorLabels = 389  ( 410 )   LayerLabels = 389  ( 410 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
--- a/tests/de/iges_1/Q3
+++ b/tests/de/iges_1/Q3
@@ -1,14 +1,14 @@
 # !!!! 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 CR22598 ALL: CHECKSHAPE : Faulty" 

 set filename 919-001-T02-04-CP-VL.igs

 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 98  ( 1376 )  Summary  = 98  ( 1376 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 899  ( 899 )   Summary  = 24042  ( 24038 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 899  ( 899 )   FreeWire = 366  ( 366 )   FreeEdge  = 3783 ( 3783 )   SharedEdge = 9390  ( 9388 )
 TOLERANCE   : MaxTol   =   0.3151652209  (   0.3151652209 )  AvgTol   =  0.0006858150184  (  0.000729734612 )
--- a/tests/de/iges_1/R3
+++ b/tests/de/iges_1/R3
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 211  ( 2186 )  Summary  = 211  ( 2186 )
 CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   Summary  = 30412  ( 30408 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   FreeWire = 39  ( 39 )   FreeEdge  = 979 ( 979 )   SharedEdge = 14224  ( 14222 )
-TOLERANCE   : MaxTol   =   0.9989623361  (   0.9989623361 )  AvgTol   =  0.008004743627  (  0.008006427388 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   Summary  = 30411  ( 30408 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   FreeWire = 39  ( 39 )   FreeEdge  = 979 ( 979 )   SharedEdge = 14223  ( 14222 )
+TOLERANCE   : MaxTol   =   0.9989623361  (   0.9989623361 )  AvgTol   =   0.00936440041  (  0.009365667686 )
 LABELS      : N0Labels = 1063  ( 1063 )  N1Labels = 0  ( 1675 )  N2Labels = 0  ( 0 )   TotalLabels = 1063  ( 2738 )   NameLabels = 1063  ( 1644 )   ColorLabels = 1024  ( 2738 )   LayerLabels = 1024  ( 2738 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 5 )
--- a/tests/de/iges_1/R8
+++ b/tests/de/iges_1/R8
@@ -7,10 +7,10 @@ set filename BUC60743.igs
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 3  ( 59 )  Warnings = 2203  ( 4655 )  Summary  = 2206  ( 4714 )
-CHECKSHAPE  : Wires    = 7  ( 16 )  Faces    = 6  ( 11 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 2837 )   Summary  = 45817  ( 39080 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 3349 )   FreeWire = 6  ( 6 )   FreeEdge  = 67 ( 67 )   SharedEdge = 19532  ( 16687 )
-TOLERANCE   : MaxTol   =    4.854604894  (    5.769095076 )  AvgTol   =   0.01611269216  (   0.01730055221 )
+CHECKSHAPE  : Wires    = 7  ( 17 )  Faces    = 7  ( 12 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 2837 )   Summary  = 45816  ( 39080 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 3349 )   FreeWire = 6  ( 6 )   FreeEdge  = 67 ( 67 )   SharedEdge = 19531  ( 16687 )
+TOLERANCE   : MaxTol   =    4.854604894  (    5.769095076 )  AvgTol   =   0.01628658326  (   0.01747356296 )
 LABELS      : N0Labels = 11  ( 11 )  N1Labels = 2891  ( 6256 )  N2Labels = 0  ( 0 )   TotalLabels = 2902  ( 6267 )   NameLabels = 2900  ( 5879 )   ColorLabels = 2891  ( 6256 )   LayerLabels = 2411  ( 5261 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
--- a/tests/de/iges_2/A4
+++ b/tests/de/iges_2/A4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 9 )  Warnings = 110  ( 1040 )  Summary  = 110  ( 1
 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.6358507691  (    4.452024967 )  AvgTol   =  0.002687669987  (   0.00407957753 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/iges_2/A7
+++ b/tests/de/iges_2/A7
@@ -2,6 +2,7 @@
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
+puts "TODO CR23096 ALL: NBSHAPES : Faulty"

 set LinuxDiff 2
 set LinuxFaulties {NBSHAPES}
@@ -10,9 +11,9 @@ set filename CTS18547.igs
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 49 )  Warnings = 41  ( 1012 )  Summary  = 41  ( 1061 )
-CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   Summary  = 12802  ( 12800 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   FreeWire = 19  ( 21 )   FreeEdge  = 1864 ( 1864 )   SharedEdge = 4959  ( 4957 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/A9
+++ b/tests/de/iges_2/A9
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO 0025623 ALL: CHECKSHAPE : Faulty" 

 set LinuxDiff 3
 set filename Amino_172448-65210.igs
@@ -9,9 +9,9 @@ set filename Amino_172448-65210.igs
 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    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2346  ( 1106 )   Summary  = 59781  ( 25969 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2346  ( 2342 )   FreeWire = 2328  ( 2328 )   FreeEdge  = 14016 ( 14016 )   SharedEdge = 24556  ( 10687 )
+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  ( 25969 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2342  ( 2342 )   FreeWire = 2328  ( 2328 )   FreeEdge  = 14016 ( 14016 )   SharedEdge = 24558  ( 10687 )
 TOLERANCE   : MaxTol   =   0.9711309062  (   0.9711309063 )  AvgTol   =   0.01916076754  (   0.01948753951 )
 LABELS      : N0Labels = 250  ( 250 )  N1Labels = 2268  ( 3205 )  N2Labels = 0  ( 0 )   TotalLabels = 2518  ( 3455 )   NameLabels = 2518  ( 3453 )   ColorLabels = 2512  ( 3449 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/B1
+++ b/tests/de/iges_2/B1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
@@ -12,8 +11,8 @@ 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  = 60881  ( 60890 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 732  ( 732 )   FreeWire = 1612  ( 1613 )   FreeEdge  = 16359 ( 16359 )   SharedEdge = 22931  ( 22935 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/C2
+++ b/tests/de/iges_2/C2
@@ -11,9 +11,9 @@ 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  = 5330  ( 5352 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   Summary  = 5330  ( 5351 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   FreeWire = 4  ( 4 )   FreeEdge  = 42 ( 42 )   SharedEdge = 2221  ( 2227 )
-TOLERANCE   : MaxTol   =    4.549042095  (    4.543567878 )  AvgTol   =   0.03220479855  (   0.03563724531 )
+TOLERANCE   : MaxTol   =    4.548096104  (    4.543567878 )  AvgTol   =   0.03300579563  (   0.03647254811 )
 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 )
--- a/tests/de/iges_2/C4
+++ b/tests/de/iges_2/C4
@@ -1,5 +1,8 @@
 # !!!! 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: NBSHAPES : Faulty" 
+puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 

 set LinuxDiff 1
 set filename PRO14323.igs
@@ -8,9 +11,9 @@ 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 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   Summary  = 3509  ( 3508 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   FreeWire = 21  ( 21 )   FreeEdge  = 435 ( 435 )   SharedEdge = 1387  ( 1387 )
-TOLERANCE   : MaxTol   =   0.7766762288  (   0.7767538966 )  AvgTol   =   0.01313632194  (   0.01322061361 )
+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 )
 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 )
--- a/tests/de/iges_2/C6
+++ b/tests/de/iges_2/C6
@@ -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 0025623 ALL: CHECKSHAPE : Faulty" 


 set filename PRO19800.igs
@@ -8,9 +9,9 @@ set filename PRO19800.igs
 set ref_data {
 DATA        : 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    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 11  ( 11 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5  ( 5 )
+CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 13  ( 11 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6  ( 5 )
 TOLERANCE   : MaxTol   =  0.04476902169  (  0.04476636368 )  AvgTol   =   0.02402039477  (   0.02401933664 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 5 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 6 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 6 )   LayerLabels = 1  ( 6 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/E1
+++ b/tests/de/iges_2/E1
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 2 )  Warnings = 0  ( 48 )  Summary  = 0  ( 50 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 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.0311002192  (    0.4059717949 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
--- a/tests/de/iges_2/F9
+++ b/tests/de/iges_2/F9
@@ -10,8 +10,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 277  ( 2065 )  Summary  = 277  ( 2067 )
 CHECKSHAPE  : Wires    = 0  ( 3 )  Faces    = 0  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   Summary  = 38865  ( 38834 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   FreeWire = 516  ( 528 )   FreeEdge  = 6208 ( 6208 )   SharedEdge = 15328  ( 15304 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   Summary  = 38866  ( 38834 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   FreeWire = 516  ( 528 )   FreeEdge  = 6208 ( 6208 )   SharedEdge = 15329  ( 15304 )
 TOLERANCE   : MaxTol   =   0.7947997475  (   0.4653265785 )  AvgTol   =  0.001017262894  (  0.0008404073573 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 5689  ( 14457 )  N2Labels = 0  ( 0 )   TotalLabels = 5694  ( 14462 )   NameLabels = 5694  ( 7040 )   ColorLabels = 5689  ( 14461 )   LayerLabels = 5689  ( 14461 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/G1
+++ b/tests/de/iges_2/G1
@@ -12,9 +12,9 @@ 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  ( 2 )  Faces    = 8  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 2312 )   Summary  = 112063  ( 71736 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 3592 )   FreeWire = 4024  ( 4024 )   FreeEdge  = 28849 ( 28849 )   SharedEdge = 44966  ( 28775 )
+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 )
 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 )
--- a/tests/de/iges_2/G8
+++ b/tests/de/iges_2/G8
@@ -11,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 145  ( 1619 )  Summary  = 145  ( 1621 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 253  ( 253 )   Summary  = 5360  ( 5363 )
+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.04061865832  (  0.03139483949 )  AvgTol   =  0.0003212756237  (  0.0002830654529 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 4 )
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -1,6 +1,5 @@
 # !!!! 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" 

@@ -12,8 +11,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 3 )  Warnings = 274  ( 4465 )  Summary  = 274  ( 4468 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   Summary  = 39243  ( 39275 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17944  ( 17947 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   Summary  = 39230  ( 39268 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17933  ( 17940 )
 TOLERANCE   : MaxTol   =   4.337400808e+088  (    8.082392835e+086 )  AvgTol   =  2.040579288e+085  (    5.099401401e+083 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 1643  ( 9638 )  N2Labels = 0  ( 0 )   TotalLabels = 1649  ( 9644 )   NameLabels = 1649  ( 2890 )   ColorLabels = 1645  ( 9643 )   LayerLabels = 489  ( 3997 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_2/I7
+++ b/tests/de/iges_2/I7
@@ -1,7 +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 CR23096 ALL: NBSHAPES : Faulty" 

 set filename ims016.igs

@@ -9,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 402 )  Summary  = 120  ( 402 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   Summary  = 10563  ( 10563 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   FreeWire = 6  ( 6 )   FreeEdge  = 353 ( 353 )   SharedEdge = 4949  ( 4949 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   Summary  = 10561  ( 10563 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   FreeWire = 6  ( 6 )   FreeEdge  = 353 ( 353 )   SharedEdge = 4947  ( 4949 )
 TOLERANCE   : MaxTol   =  0.07559058774  (  0.07559058772 )  AvgTol   =  0.0006486647078  (  0.0006485486933 )
 LABELS      : N0Labels = 503  ( 503 )  N1Labels = 0  ( 196 )  N2Labels = 0  ( 0 )   TotalLabels = 503  ( 699 )   NameLabels = 503  ( 503 )   ColorLabels = 470  ( 699 )   LayerLabels = 313  ( 344 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/iges_3/A4
+++ b/tests/de/iges_3/A4
@@ -12,10 +12,10 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 12  ( 238 )  Warnings = 470  ( 2526 )  Summary  = 482  ( 2764 )
 CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   Summary  = 22207  ( 22290 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   FreeWire = 96  ( 170 )   FreeEdge  = 1061 ( 1061 )   SharedEdge = 9265  ( 9275 )
-TOLERANCE   : MaxTol   =   0.8630766579  (    1.367916315 )  AvgTol   =  0.008032623547  (  0.008257993798 )
-LABELS      : N0Labels = 27  ( 27 )  N1Labels = 2100  ( 6099 )  N2Labels = 0  ( 0 )   TotalLabels = 2127  ( 6126 )   NameLabels = 2127  ( 2596 )   ColorLabels = 2114  ( 6125 )   LayerLabels = 2114  ( 6125 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   Summary  = 22209  ( 22292 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   FreeWire = 96  ( 170 )   FreeEdge  = 1061 ( 1061 )   SharedEdge = 9267  ( 9277 )
+TOLERANCE   : MaxTol   =   0.8099726869  (    1.367966665 )  AvgTol   =  0.008047288197  (  0.008376941947 )
+LABELS      : N0Labels = 27  ( 27 )  N1Labels = 2100  ( 6101 )  N2Labels = 0  ( 0 )   TotalLabels = 2127  ( 6128 )   NameLabels = 2127  ( 2596 )   ColorLabels = 2114  ( 6127 )   LayerLabels = 2114  ( 6127 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 12 )
 COLORS      : Colors   = BLUE1 CYAN1 CYAN2 DARKGOLDENROD GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW  ( BLUE1 CYAN1 CYAN2 DARKGOLDENROD GRAY53 GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW )
--- a/tests/de/iges_3/A6
+++ b/tests/de/iges_3/A6
@@ -11,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 16  ( 3 )  Warnings = 46  ( 305 )  Summary  = 62  ( 308 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   Summary  = 3869  ( 3869 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   Summary  = 3870  ( 3869 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   FreeWire = 64  ( 64 )   FreeEdge  = 617 ( 617 )   SharedEdge = 1627  ( 1627 )
-TOLERANCE   : MaxTol   =   0.0521262172  (   0.0521264751 )  AvgTol   =  0.0004294496628  (  0.0004227153137 )
+TOLERANCE   : MaxTol   =  0.09719916174  (  0.09719915743 )  AvgTol   =  0.001636226349  (  0.001630578185 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 346  ( 756 )  N2Labels = 0  ( 0 )   TotalLabels = 348  ( 758 )   NameLabels = 348  ( 478 )   ColorLabels = 347  ( 757 )   LayerLabels = 336  ( 744 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 3 )
--- a/tests/de/iges_3/A9
+++ b/tests/de/iges_3/A9
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5745  ( 31066 )  Summary  = 5745  ( 31066 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   Summary  = 158092  ( 158092 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 72654  ( 72654 )
-TOLERANCE   : MaxTol   =   0.9560441943  (   0.9560441934 )  AvgTol   =   0.00182443883  (  0.001822190978 )
+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 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/step_1/A3
+++ b/tests/de/step_1/A3
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 42  ( 58 )  Summary  = 42  ( 58 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   Summary  = 579  ( 530 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 220  ( 218 )
-TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0002622543709  (  0.0002642585768 )
+TOLERANCE   : MaxTol   = 0.003591433268  ( 0.006121716429 )  AvgTol   =  0.0002657130942  (  0.0004625449099 )
 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 )
--- a/tests/de/step_1/A7
+++ b/tests/de/step_1/A7
@@ -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: LABELS : Faulty" 


@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 33  ( 32 )  Summary  = 33  ( 32 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 101  ( 101 )   Summary  = 604  ( 604 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 134  ( 134 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 221  ( 221 )
-TOLERANCE   : MaxTol   = 0.0002663670698  ( 0.0002663644067 )  AvgTol   =  6.037718226e-006  (  6.059069808e-006 )
+TOLERANCE   : MaxTol   = 0.0002663644062  ( 0.004247215546 )  AvgTol   =  6.0376793e-006  (  9.943585154e-005 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 18  ( 23 )  N2Labels = 0  ( 5 )   TotalLabels = 31  ( 41 )   NameLabels = 27  ( 27 )   ColorLabels = 12  ( 12 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
--- a/tests/de/step_1/B4
+++ b/tests/de/step_1/B4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 40 )  Summary  = 4  ( 40 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 36  ( 3 )  Face     = 186  ( 186 )   Summary  = 1404  ( 1371 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 36  ( 3 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 548  ( 548 )
-TOLERANCE   : MaxTol   =  0.00767687178  ( 0.007676871778 )  AvgTol   =  0.000146989591  (  0.0001476364721 )
+TOLERANCE   : MaxTol   = 0.007676795012  (  0.01770527621 )  AvgTol   =  0.0001484581256  (  0.0002068814634 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 36  ( 36 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
--- a/tests/de/step_1/B7
+++ b/tests/de/step_1/B7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   Summary  = 11  ( 11 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4  ( 4 )
-TOLERANCE   : MaxTol   = 0.007328453216  ( 0.007328453217 )  AvgTol   =  0.005461043908  (  0.005461043909 )
+TOLERANCE   : MaxTol   =  0.01553531324  (  0.04002196131 )  AvgTol   =  0.009251748359  (   0.02246039438 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1  ( 1 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/step_1/C2
+++ b/tests/de/step_1/C2
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 


 set filename PRO12761.stp
@@ -9,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 3 )  Summary  = 9  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   Summary  = 282  ( 262 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 108  ( 107 )
-TOLERANCE   : MaxTol   = 0.009538012231  ( 0.006059255816 )  AvgTol   =  0.0006604275096  (  0.0005391951287 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   Summary  = 281  ( 262 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 107  ( 107 )
+TOLERANCE   : MaxTol   = 0.008665713529  (  0.01506194194 )  AvgTol   =  0.0006799119121  (  0.001501244216 )
 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 )
 NCOLORS     : NColors  = 0  ( 0 )
--- a/tests/de/step_1/C3
+++ b/tests/de/step_1/C3
@@ -1,5 +1,4 @@
 # !!!! 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
@@ -10,7 +9,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.0006781202362  (  0.0006785080306 )
+TOLERANCE   : MaxTol   = 0.009952224089  ( 0.009952224089 )  AvgTol   =  0.0007250477715  (  0.000901206859 )
 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 )
--- a/tests/de/step_1/C7
+++ b/tests/de/step_1/C7
@@ -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: LABELS : Faulty" 


@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 1 )  Summary  = 6  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 52  ( 52 )  Face     = 52  ( 52 )   Summary  = 1126  ( 942 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 52  ( 52 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 484  ( 484 )
-TOLERANCE   : MaxTol   = 0.002730674215  ( 0.002730674215 )  AvgTol   =  0.0001713195092  (  0.0002334494908 )
+TOLERANCE   : MaxTol   = 0.002730674215  (   0.0116718272 )  AvgTol   =  0.000209395694  (  0.001020276868 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 105  ( 53 )  N2Labels = 0  ( 0 )   TotalLabels = 107  ( 55 )   NameLabels = 3  ( 3 )   ColorLabels = 104  ( 53 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/step_1/E3
+++ b/tests/de/step_1/E3
@@ -8,7 +8,7 @@ set filename bm1_sy_exhaust.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 12 )  Summary  = 21  ( 12 )
-CHECKSHAPE  : Wires    = 2  ( 0 )  Faces    = 2  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 6  ( 1 )  Faces    = 6  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   Summary  = 289  ( 266 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 24 ( 24 )   SharedEdge = 103  ( 103 )
 TOLERANCE   : MaxTol   = 6.104502198e-006  (         1e-005 )  AvgTol   =  9.28336616e-007  (  2.903661931e-006 )
--- a/tests/de/step_1/E5
+++ b/tests/de/step_1/E5
@@ -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: STATSHAPE : Faulty" 


@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 1 )  Summary  = 6  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 5  ( 1 )  Face     = 78  ( 78 )   Summary  = 510  ( 506 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 5  ( 1 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 206  ( 206 )
-TOLERANCE   : MaxTol   = 0.005871790092  ( 0.005871790092 )  AvgTol   =  0.0001195955053  (  0.0001195955053 )
+TOLERANCE   : MaxTol   = 0.005871790092  (  0.01255641392 )  AvgTol   =  0.0001232801436  (  0.0004487678765 )
 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 )
 NCOLORS     : NColors  = 0  ( 0 )
--- a/tests/de/step_1/E7
+++ b/tests/de/step_1/E7
@@ -10,7 +10,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    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   Summary  = 837  ( 475 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   FreeWire = 0  ( 16 )   FreeEdge  = 16 ( 16 )   SharedEdge = 312  ( 165 )
-TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.000816761578 )  AvgTol   =  5.200297581e-005  (  9.917834779e-005 )
+TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.0009782609385 )  AvgTol   =  5.20029758e-005  (  0.0001030777287 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 60  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 63  ( 79 )   NameLabels = 5  ( 5 )   ColorLabels = 58  ( 74 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/step_1/G1
+++ b/tests/de/step_1/G1
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 184 )  Summary  = 9  ( 184 )
 CHECKSHAPE  : Wires    = 2  ( 0 )  Faces    = 2  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 236  ( 236 )   Summary  = 1654  ( 1655 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 236  ( 236 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 653  ( 653 )
-TOLERANCE   : MaxTol   =   0.9036712736  ( 0.004380869839 )  AvgTol   =  0.002836223222  (  0.0001546745731 )
+TOLERANCE   : MaxTol   =   0.9036712736  (  0.01854047103 )  AvgTol   =  0.002851128061  (  0.0005801792851 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 34  ( 34 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 1  ( 1 )   ColorLabels = 35  ( 35 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 11 )
--- a/tests/de/step_1/G4
+++ b/tests/de/step_1/G4
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 369  ( 361 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 145  ( 145 )
-TOLERANCE   : MaxTol   = 0.002782235243  ( 0.002782235243 )  AvgTol   =  0.0002755630596  (  0.0002755632068 )
+TOLERANCE   : MaxTol   = 0.002782235243  ( 0.008046428382 )  AvgTol   =  0.0002755630596  (  0.0008383168463 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7  ( 9 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 12 )   NameLabels = 5  ( 5 )   ColorLabels = 5  ( 5 )   LayerLabels = 5  ( 7 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
--- a/tests/de/step_1/I2
+++ b/tests/de/step_1/I2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 2 )  Summary  = 0  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   Summary  = 73  ( 73 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 31  ( 31 )
-TOLERANCE   : MaxTol   = 0.004821884032  ( 0.004821883985 )  AvgTol   =  0.0006277753383  (  0.0006277753348 )
+TOLERANCE   : MaxTol   = 0.004821884032  (   0.2046977269 )  AvgTol   =  0.0006277936905  (   0.01292923854 )
 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 )
--- a/tests/de/step_1/I5
+++ b/tests/de/step_1/I5
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 4 )  Summary  = 14  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   Summary  = 366  ( 345 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   FreeWire = 0  ( 4 )   FreeEdge  = 24 ( 24 )   SharedEdge = 147  ( 146 )
-TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =  0.005840669333  (  0.005686183039 )
+TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =  0.006103158242  (  0.006647466389 )
 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 )
 NCOLORS     : NColors  = 0  ( 0 )
--- a/tests/de/step_1/I7
+++ b/tests/de/step_1/I7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 103  ( 103 )   Summary  = 748  ( 720 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 103  ( 103 )   FreeWire = 0  ( 0 )   FreeEdge  = 28 ( 28 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   =  0.07080255958  (  0.07080255958 )  AvgTol   =  0.001643516697  (  0.001643516697 )
+TOLERANCE   : MaxTol   =  0.07080255958  (  0.07080255958 )  AvgTol   =  0.001643516697  (  0.002252531923 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
--- a/tests/de/step_1/J5
+++ b/tests/de/step_1/J5
@@ -4,7 +4,7 @@ set filename bm1_ie_t4.stp
 set ref_data {
 DATA        : 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 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  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.005727453836  ( 0.005727453946 )  AvgTol   =  0.001247002689  (  0.001247002697 )
--- a/tests/de/step_1/J6
+++ b/tests/de/step_1/J6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 

 set LinuxDiff 2
 set LinuxFaulties {STATSHAPE}
@@ -8,9 +7,9 @@ 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    = 2  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 13  ( 12 )  Face     = 16  ( 15 )   Summary  = 154  ( 151 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 13  ( 12 )  Face     = 16  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 59  ( 60 )
+CHECKSHAPE  : Wires    = 2  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 15  ( 15 )   Summary  = 151  ( 151 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 15  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 59  ( 60 )
 TOLERANCE   : MaxTol   =    1562.051497  (    1562.051497 )  AvgTol   =     192.5735494  (     206.7634854 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
--- a/tests/de/step_1/J8
+++ b/tests/de/step_1/J8
@@ -8,7 +8,7 @@ set filename bm1_sy_lever.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 9 )  Summary  = 11  ( 9 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 99  ( 99 )   Summary  = 655  ( 656 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 99  ( 99 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 266 )
 TOLERANCE   : MaxTol   =    3.000180002  (    3.000180002 )  AvgTol   =    0.1203601833  (    0.1203606739 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nbv	2873301ed5	Compiler error has been eliminated. DRAW-command has been added.	2015-09-08 11:30:14 +03:00
aml	d6663ff228	0017129: ShapeFix projector makes 2d curves with oscillations Usage of Projlib added in case of uneven points distribution. Test cases are updated to the new behavior. Test cases for issue CR17129 Correction of test case for issue CR17129	2015-09-07 18:09:28 +03:00
aml	32a0f854ea	0022598: Approximation of p-curve by 2D line Check whether p-curve being projected can be approximated by straight line is made before full-scale projection, to improve performance. If straight, pcurve is created as Line only if this will lead to the same range parameterization as 3d curve, otherwise BSpline of degree 1 is created. Re-approximation of line pcurves by bsplines removed from ShapeFix_Edge. Test case updating to new behavior. Added "static" keyword to the fixPeriodictyTroubles() function. Update of test-cases according new behavior Conflicts: tests/de/step_3/D9	2015-09-07 18:08:34 +03:00
azv	430f341f81	0025656: Specification of semantic of Closed flag of an edge 1. Using of the "Closed" flag was unified: a) this flag is applicable for TopoDS_Wire and TopoDS_Shell only, because these entities may hedge an area in 2D space or a volume in 3D space correspondingly; b) other types of TopoDS shapes are passing over this flag; c) changing of this flag should be controlled by high-level algorithms (not BRep_Builder). 2. Implemented verification of the closedness of edges. An edge is closed if and only if its first and last vertices are the same. 3. Test cases were changed according to new behavior. Conflicts: src/BRepFill/BRepFill_OffsetWire.cxx	2015-09-07 18:06:42 +03:00