Next intermediate version

src/ChFi3d/ChFi3d.cxx

@@ -38,6 +38,7 @@
 Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1, 
 				     const BRepAdaptor_Surface& S2, 
 				     const TopoDS_Edge& E,
+                                     BRepOffset_Type& ConnectType,
 				     TopAbs_Orientation& Or1, 
 				     TopAbs_Orientation& Or2)
 
@@ -49,7 +50,8 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
   Standard_Real last = CE.LastParameter();
   Standard_Real par = 0.691254*first + 0.308746*last;
 
-  gp_Pnt pt, pt1, pt2; gp_Vec tgE, tgE1, tgE2, ns1, ns2, dint1, dint2;
+  gp_Pnt pt, pt1, pt2;
+  gp_Vec tgE, tgE1, tgE2, ns1, ns2, dint1, dint2;
   TopoDS_Face F1 = S1.Face();
   TopoDS_Face F2 = S2.Face();
   //F1.Orientation(TopAbs_FORWARD);
@@ -110,8 +112,18 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
 
   dint1 = ns1.Crossed(tgE1);
   dint2 = ns2.Crossed(tgE2);
-  Standard_Real ang = ns1.CrossMagnitude(ns2);
+  gp_Vec ProdNormals = ns1 ^ ns2;
+  //Standard_Real ang = ns1.CrossMagnitude(ns2);
+  Standard_Real ang = ProdNormals.Magnitude();
   if(ang > 0.0001*M_PI){
+
+    ProdNormals /= ang;
+    Standard_Real ScalProd = tgE1 * ProdNormals;
+    if (ScalProd > 0.)
+      ConnectType = BRepOffset_Convex;
+    else
+      ConnectType = BRepOffset_Concave;
+    
     Standard_Real scal = ns2.Dot(dint1);
     if ( scal <= 0. ){
       ns2.Reverse();
@@ -185,6 +197,15 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
       ns2 = DU2.Crossed(DV2);
       if (F2.Orientation() == TopAbs_REVERSED)
         ns2.Reverse();
+
+      ProdNormals = ns1 ^ ns2;
+      ProdNormals.Normalize();
+      Standard_Real ScalProd = tgE1 * ProdNormals;
+      if (ScalProd > 0.)
+        ConnectType = BRepOffset_Convex;
+      else
+        ConnectType = BRepOffset_Concave;
+      
       gp_Vec vref(pt1,pt2);
       if(ns1.Dot(vref) < 0.){
 	Or1 = TopAbs_REVERSED;

src/ChFi3d/ChFi3d.hxx

@@ -23,6 +23,7 @@
 
 #include <Standard_Integer.hxx>
 #include <TopAbs_Orientation.hxx>
+#include <BRepOffset_Type.hxx>
 #include <Standard_Boolean.hxx>
 class BRepAdaptor_Surface;
 class TopoDS_Edge;
@@ -49,7 +50,12 @@ public:
   //! if  not, it  returns the  number of  choice of  the fillet
   //! or chamfer corresponding to  the orientations  calculated
   //! and  to  the tangent to  the  guide line read in  E.
-  Standard_EXPORT static Standard_Integer ConcaveSide (const BRepAdaptor_Surface& S1, const BRepAdaptor_Surface& S2, const TopoDS_Edge& E, TopAbs_Orientation& Or1, TopAbs_Orientation& Or2);
+  Standard_EXPORT static Standard_Integer ConcaveSide (const BRepAdaptor_Surface& S1,
+                                                       const BRepAdaptor_Surface& S2,
+                                                       const TopoDS_Edge& E,
+                                                       BRepOffset_Type& ConnectType,
+                                                       TopAbs_Orientation& Or1,
+                                                       TopAbs_Orientation& Or2);
   
   //! Same  as ConcaveSide, but the orientations are
   //! logically  deduced from  the result of  the call of

src/ChFi3d/ChFi3d_Builder.cxx

@@ -68,6 +68,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
+//#include <BRepAlgoAPI_Fuse.hxx>
+#include <BOPAlgo_Builder.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_BuildTool.hxx>
 #include <TopOpeBRepDS_Curve.hxx>
@@ -372,7 +374,7 @@ void  ChFi3d_Builder::Compute()
     
     
     if (done) {
-      BRep_Builder B1;
+      BRep_Builder BB;
       CompleteDS(DStr,myShape);
       //Update tolerances on vertex to max adjacent edges or
       //Update tolerances on degenerated edge to max of adjacent vertexes.
@@ -398,7 +400,7 @@ void  ChFi3d_Builder::Compute()
 	      if( tolc < tolv ) tolc = tolv + 0.00001;
 	    }
 	    if(degen && tolc < tolv) tolc = tolv;
-	    else if(tolc>tolv) B1.UpdateVertex(v,tolc);
+	    else if(tolc>tolv) BB.UpdateVertex(v,tolc);
 	  }
 	  else if(gk == TopOpeBRepDS_POINT){
 	    TopOpeBRepDS_Point& p = DStr.ChangePoint(gi);
@@ -409,7 +411,60 @@ void  ChFi3d_Builder::Compute()
 	}
 	if(degen) c.Tolerance(tolc);
       }
+      //jgv
+      
+      //for (on modified faces)
+      //compound of wires from each face
+      //compound of new edges for this face
+      //general fuse (compound of wires from a face, compound of new edges for this face)
+      //method building new face from old and new edges
+      //assembling of resulting shape from modified and unmodified faces.
+      for (Standard_Integer i = 1; i <= myNewFaces.Extent(); i++)
+      {
+        TopoDS_Shape aFace = myNewFaces(i);
+        aFace.Orientation(TopAbs_FORWARD);
+        TopoDS_Compound aWires;
+        BB.MakeCompound(aWires);
+        TopoDS_Iterator itw(aFace);
+        for (; itw.More(); itw.Next())
+          BB.Add(aWires, itw.Value());
+
+        TopoDS_Compound aNewEdges;
+        BB.MakeCompound(aNewEdges);
+        ChFi3d_ListIteratorOfListOfQualifiedEdge itl(myFaceNewEdges.FindFromKey(i));
+        for (; itl.More(); itl.Next())
+        {
+          Standard_Integer anIndex = itl.Value().Index;
+          TopoDS_Shape aNewEdge = myNewEdges(anIndex);
+          aNewEdge.Orientation(itl.Value().Orientation);
+          BB.Add(aNewEdges, aNewEdge);
+        }
+        //BRepAlgoAPI_Fuse aFuse(aWires, aNewEdges);
+        BOPAlgo_Builder GenFuse;
+        GenFuse.AddArgument(aWires);
+        GenFuse.AddArgument(aNewEdges);
+        GenFuse.Perform();
+        TopoDS_Shape aNewFace = aFace.EmptyCopied();
+        const TopoDS_Shape& aResFuse = GenFuse.Shape();
+        const BOPCol_DataMapOfShapeListOfShape& ModifiedShapes = GenFuse.Images();
+        for (itw.Initialize(aWires); itw.More(); itw.Next())
+        {
+          const TopoDS_Shape& aWire = itw.Value();
+          if (!ModifiedShapes.IsBound(aWire))
+            continue;
+          const TopTools_ListOfShape& aListOfModified = ModifiedShapes(aWire);
+          TopTools_ListIteratorOfListOfShape itwm(aListOfModified);
+          for (; itwm.More(); itwm.Next())
+          {
+            const TopoDS_Shape& aModifiedWire = itwm.Value();
+            cout<<"a Modified Wire ..."<<endl;
+          }
+        }
+      }
+
       myCoup->Perform(myDS);
+      //jgv//
+      
       TColStd_MapIteratorOfMapOfInteger It(MapIndSo);
       for(; It.More(); It.Next()){
 	Standard_Integer indsol = It.Key();
@@ -431,18 +486,18 @@ void  ChFi3d_Builder::Compute()
 	  for (; exv.More(); exv.Next() ) {
 	    const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());
 	    Standard_Real tolv = BRep_Tool::Tolerance(v);
-	    if (tole>tolv) B1.UpdateVertex(v,tole);
+	    if (tole>tolv) BB.UpdateVertex(v,tole);
 	  }
 	}
       }
       if (!hasresult) {
-      B1.MakeCompound(TopoDS::Compound(myShapeResult));
+      BB.MakeCompound(TopoDS::Compound(myShapeResult));
       for(It.Reset(); It.More(); It.Next()){
 	Standard_Integer indsol = It.Key();
 	const TopoDS_Shape& curshape = DStr.Shape(indsol);
 	TopTools_ListIteratorOfListOfShape 
 	  its = myCoup->Merged(curshape,TopAbs_IN);
-	if(!its.More()) B1.Add(myShapeResult,curshape);
+	if(!its.More()) BB.Add(myShapeResult,curshape);
 	else {
 	  //If the old type of Shape is Shell, Shell is placed instead of Solid, 
           //However there is a problem for compound of open Shell.
@@ -452,11 +507,11 @@ void  ChFi3d_Builder::Compute()
 	      TopExp_Explorer expsh2(its.Value(),TopAbs_SHELL);
 	      const TopoDS_Shape& cursh = expsh2.Current();
 	      TopoDS_Shape tt = cursh;
-	      B1.Add(myShapeResult,cursh);
+	      BB.Add(myShapeResult,cursh);
 	      its.Next();
 	    }
 	    else {
-	      B1.Add(myShapeResult,its.Value());
+	      BB.Add(myShapeResult,its.Value());
 	      its.Next();
 	    }
 	  }
@@ -465,16 +520,16 @@ void  ChFi3d_Builder::Compute()
       }
       else {
        done=Standard_False;
-       B1.MakeCompound(TopoDS::Compound(badShape));
+       BB.MakeCompound(TopoDS::Compound(badShape));
       for(It.Reset(); It.More(); It.Next()){
 	Standard_Integer indsol = It.Key();
 	const TopoDS_Shape& curshape = DStr.Shape(indsol);
 	TopTools_ListIteratorOfListOfShape 
 	  its = myCoup->Merged(curshape,TopAbs_IN);
-	if(!its.More()) B1.Add(badShape,curshape);
+	if(!its.More()) BB.Add(badShape,curshape);
 	else {
 	  while (its.More()) { 
-	    B1.Add(badShape,its.Value());
+	    BB.Add(badShape,its.Value());
 	    its.Next();
 	  }
 	}

src/ChFi3d/ChFi3d_Builder.hxx

@@ -30,11 +30,13 @@
 #include <ChFiDS_Regularities.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ChFiDS_ErrorStatus.hxx>
 #include <math_Vector.hxx>
 #include <TopAbs_Orientation.hxx>
+#include <BRepOffset_Type.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <TopAbs_State.hxx>
 class TopOpeBRepDS_HDataStructure;
@@ -70,6 +72,24 @@ class TopoDS_Face;
 class AppBlend_Approx;
 class Geom2d_Curve;
 
+struct QualifiedEdge
+{
+  Standard_Integer Index;
+  TopAbs_Orientation Orientation;
+  BRepOffset_Type Convexity;
+  
+  QualifiedEdge(Standard_Integer theIndex,
+                TopAbs_Orientation theOrientation,
+                BRepOffset_Type theConvexity)
+    : Index(theIndex),
+      Orientation(theOrientation),
+      Convexity(theConvexity)
+  {
+  }
+};
+
+typedef NCollection_List<QualifiedEdge> ChFi3d_ListOfQualifiedEdge;
+typedef ChFi3d_ListOfQualifiedEdge::Iterator ChFi3d_ListIteratorOfListOfQualifiedEdge;
 
 //! Root  class  for calculation of  surfaces (fillets,
 //! chamfers)  destined  to smooth edges  of
@@ -221,7 +241,7 @@ protected:
   
   Standard_EXPORT Standard_Boolean PerformElement (const Handle(ChFiDS_Spine)& CElement);
   
-  Standard_EXPORT void PerformExtremity (const Handle(ChFiDS_Spine)& CElement);
+  Standard_EXPORT void PerformExtremity (Handle(ChFiDS_Spine)& CElement);
   
   Standard_EXPORT void PerformSetOfSurf (Handle(ChFiDS_Stripe)& S, const Standard_Boolean Simul = Standard_False);
   
@@ -304,6 +324,11 @@ protected:
   ChFiDS_Map myVFMap;
   ChFiDS_Map myVEMap;
   Handle(TopOpeBRepDS_HDataStructure) myDS;
+  //TopTools_IndexedDataMapOfShapeListOfShape myFaceNewEdges;
+  //NCollection_IndexedDataMap<Standard_Integer, TColStd_ListOfInteger> myFaceNewEdges;
+  NCollection_IndexedDataMap<Standard_Integer, ChFi3d_ListOfQualifiedEdge> myFaceNewEdges;
+  TopTools_IndexedMapOfShape myNewFaces;
+  TopTools_IndexedMapOfShape myNewEdges;
   Handle(TopOpeBRepBuild_HBuilder) myCoup;
   ChFiDS_ListOfStripe myListStripe;
   ChFiDS_StripeMap myVDataMap;
@@ -346,7 +371,11 @@ private:
   
   Standard_EXPORT void StartSol (const Handle(ChFiDS_Stripe)& S, const Handle(ChFiDS_HElSpine)& HGuide, Handle(BRepAdaptor_HSurface)& HS1, Handle(BRepAdaptor_HSurface)& HS2, Handle(BRepTopAdaptor_TopolTool)& I1, Handle(BRepTopAdaptor_TopolTool)& I2, gp_Pnt2d& P1, gp_Pnt2d& P2, Standard_Real& First) const;
   
-  Standard_EXPORT void ConexFaces (const Handle(ChFiDS_Spine)& Sp, const Standard_Integer IEdge, const Standard_Integer RefChoix, Handle(BRepAdaptor_HSurface)& HS1, Handle(BRepAdaptor_HSurface)& HS2) const;
+  Standard_EXPORT void ConexFaces (Handle(ChFiDS_Spine)& Sp,
+                                   const Standard_Integer IEdge,
+                                   const Standard_Integer RefChoix,
+                                   Handle(BRepAdaptor_HSurface)& HS1,
+                                   Handle(BRepAdaptor_HSurface)& HS2) const;
 
 
   TopoDS_Shape myShape;

src/ChFi3d/ChFi3d_Builder_0.cxx

@@ -90,6 +90,7 @@
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepLib.hxx>
+#include <BRepLib_MakeVertex.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeWire.hxx>
 #include <BRepLib_MakeFace.hxx>
@@ -192,6 +193,211 @@ Standard_Real ChFi3d_InPeriod(const Standard_Real U,
   if ( u < UFirst) u = UFirst;
   return u;
 }
+
+//=======================================================================
+//function : ChFi3d_AdjustSecondPointToFirstPoint
+//purpose  : 
+//=======================================================================
+void ChFi3d_AdjustSecondPointToFirstPoint(const gp_Pnt2d& theFirstPoint,
+                                          gp_Pnt2d& theSecondPoint,
+                                          const BRepAdaptor_Surface& theSurf)
+{
+  if (theSurf.IsUPeriodic())
+  {
+    Standard_Real UPeriod = theSurf.UPeriod();
+    Standard_Real NewU = ElCLib::InPeriod(theSecondPoint.X(),
+                                          theFirstPoint.X() - UPeriod/2,
+                                          theFirstPoint.X() + UPeriod/2);
+    theSecondPoint.SetX(NewU);
+  }
+  if (theSurf.IsVPeriodic())
+  {
+    Standard_Real VPeriod = theSurf.VPeriod();
+    Standard_Real NewV = ElCLib::InPeriod(theSecondPoint.Y(),
+                                          theFirstPoint.Y() - VPeriod/2,
+                                          theFirstPoint.Y() + VPeriod/2);
+    theSecondPoint.SetY(NewV);
+  }
+}
+
+//=======================================================================
+//function : ChFi3d_SplitAndAdjust
+//purpose  : 
+//=======================================================================
+void ChFi3d_SplitAndAdjust(const TopTools_ListOfShape& theElist,
+                           TopTools_ListOfShape& theNewElist,
+                           const BRepAdaptor_Surface& theBAsurf)
+{
+  TopoDS_Face aFace = theBAsurf.Face();
+  Handle(Geom_Surface) aSurf, aBasisSurf;
+  TopLoc_Location aLoc;
+  aSurf = BRep_Tool::Surface(aFace, aLoc);
+  aBasisSurf = aSurf;
+  if (aSurf->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface)))
+    aBasisSurf = (Handle(Geom_RectangularTrimmedSurface)::DownCast(aSurf))->BasisSurface();
+
+  if (!aBasisSurf->IsUClosed() && !aBasisSurf->IsVClosed())
+    return;
+
+  TColGeom2d_SequenceOfCurve Boundaries;
+  Standard_Real Ubounds [2], Vbounds [2];
+  aSurf->Bounds(Ubounds[0], Ubounds[1], Vbounds[0], Vbounds[1]);
+  for (Standard_Integer i = 0; i < 2; i++)
+    if (!Precision::IsInfinite(Ubounds[i]))
+    {
+      gp_Pnt2d Origin(Ubounds[i], 0.);
+      Handle(Geom2d_Curve) aLine = new Geom2d_Line(Origin, gp::DY2d());
+      if (!Precision::IsInfinite(Vbounds[0]) || !Precision::IsInfinite(Vbounds[1]))
+        aLine = new Geom2d_TrimmedCurve(aLine, Vbounds[0], Vbounds[1]);
+      Boundaries.Append(aLine);
+    }
+  for (Standard_Integer i = 0; i < 2; i++)
+    if (!Precision::IsInfinite(Vbounds[i]))
+    {
+      gp_Pnt2d Origin(0., Vbounds[i]);
+      Handle(Geom2d_Curve) aLine = new Geom2d_Line(Origin, gp::DX2d());
+      if (!Precision::IsInfinite(Ubounds[0]) || !Precision::IsInfinite(Ubounds[1]))
+        aLine = new Geom2d_TrimmedCurve(aLine, Ubounds[0], Ubounds[1]);
+      Boundaries.Append(aLine);
+    }
+  
+  Geom2dInt_GInter Intersector;
+  BRep_Builder BB;
+  TopTools_ListIteratorOfListOfShape itl(theElist);
+  for (; itl.More(); itl.Next())
+  {
+    TopoDS_Edge anEdge = TopoDS::Edge(itl.Value());
+    TopAbs_Orientation anOr = anEdge.Orientation();
+    Standard_Real aTol = BRep_Tool::Tolerance(anEdge);
+    TColStd_SequenceOfReal Params;
+    Standard_Real fpar, lpar;
+    Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(anEdge, aFace, fpar, lpar);
+    Geom2dAdaptor_Curve aGAcurve(aPCurve, fpar, lpar);
+    Standard_Real LeftTol = Precision::PConfusion(), RightTol = Precision::PConfusion();
+    BRepAdaptor_Curve BAcurve(anEdge);
+    gp_Pnt FirstPnt = BAcurve.Value(fpar);
+    gp_Pnt LastPnt  = BAcurve.Value(lpar);
+    Standard_Real Offset = 0.01*(lpar - fpar);
+    gp_Pnt PntOffset = BAcurve.Value(fpar + Offset);
+    Standard_Real dist3d = FirstPnt.Distance(PntOffset);
+    if (dist3d > gp::Resolution())
+      LeftTol = Offset*aTol/dist3d;
+    PntOffset = BAcurve.Value(lpar - Offset);
+    dist3d = LastPnt.Distance(PntOffset);
+    if (dist3d > gp::Resolution())
+      RightTol = Offset*aTol/dist3d;
+    for (Standard_Integer i = 1; i <= Boundaries.Length(); i++)
+    {
+      Geom2dAdaptor_Curve aGAboundary(Boundaries(i));
+      Intersector.Perform(aGAcurve, aGAboundary,
+                          Precision::PIntersection(),
+                          Precision::PIntersection());
+      if (Intersector.IsDone() && !Intersector.IsEmpty())
+      {
+        for (Standard_Integer j = 1; j <= Intersector.NbPoints(); j++)
+        {
+          IntRes2d_IntersectionPoint int2d = Intersector.Point(j);
+          Standard_Real aParam = int2d.ParamOnFirst();
+          if (Abs(aParam - fpar) > LeftTol &&
+              Abs(aParam - lpar) > RightTol)
+            Params.Append(aParam);
+        }
+        for (Standard_Integer j = 1; j <= Intersector.NbSegments(); j++)
+        {
+          IntRes2d_IntersectionSegment seg2d = Intersector.Segment(j);
+          IntRes2d_IntersectionPoint int2d = seg2d.FirstPoint();
+          Standard_Real aParam = int2d.ParamOnFirst();
+          if (Abs(aParam - fpar) > LeftTol &&
+              Abs(aParam - lpar) > RightTol)
+            Params.Append(aParam);
+          int2d  = seg2d.LastPoint();
+          aParam = int2d.ParamOnFirst();
+          if (Abs(aParam - fpar) > LeftTol &&
+              Abs(aParam - lpar) > RightTol)
+            Params.Append(aParam);
+        }
+      }
+    } //for (Standard_Integer i = 1; i <= Boundaries.Length(); i++)
+
+    //Sort parameters
+    for (Standard_Integer i = 1; i < Params.Length(); i++)
+      for (Standard_Integer j = i+1; j <= Params.Length(); j++)
+        if (Params(i) > Params(j))
+        { Standard_Real tmp = Params(i); Params(i) = Params(j); Params(j) = tmp; }
+    //Delete duplicating parameters
+    Standard_Real ParamTol = Max(LeftTol, RightTol);
+    Standard_Integer i = 2;
+    while (i <= Params.Length())
+      if (Params(i) - Params(i-1) > ParamTol)
+        Params.Remove(i);
+      else
+        i++;
+
+    //Split
+    TopoDS_Vertex FirstVertex = TopExp::FirstVertex(anEdge), LastVertex;
+    Standard_Real FirstPar = fpar, LastPar;
+    for (i = 1; i <= Params.Length(); i++)
+    {
+      LastPar = Params(i);
+      TopoDS_Edge aNewEdge = TopoDS::Edge(anEdge.EmptyCopied());
+      aNewEdge.Orientation(TopAbs_FORWARD);
+      BB.Range(aNewEdge, FirstPar, LastPar);
+      gp_Pnt LastPnt = BAcurve.Value(LastPar);
+      LastVertex = BRepLib_MakeVertex(LastPnt);
+      BB.UpdateVertex(LastVertex, ParamTol);
+      BB.Add(aNewEdge, FirstVertex.Oriented(TopAbs_FORWARD));
+      BB.Add(aNewEdge, LastVertex.Oriented(TopAbs_REVERSED));
+      aNewEdge.Orientation(anOr);
+      BB.UpdateEdge(aNewEdge, aTol);
+      theNewElist.Append(aNewEdge);
+      FirstVertex = LastVertex;
+      FirstPar = LastPar;
+    }
+    LastPar = lpar;
+    LastVertex = TopExp::LastVertex(anEdge);
+    TopoDS_Edge aNewEdge = TopoDS::Edge(anEdge.EmptyCopied());
+    aNewEdge.Orientation(TopAbs_FORWARD);
+    BB.Range(aNewEdge, FirstPar, LastPar);
+    BB.Add(aNewEdge, FirstVertex.Oriented(TopAbs_FORWARD));
+    BB.Add(aNewEdge, LastVertex.Oriented(TopAbs_REVERSED));
+    aNewEdge.Orientation(anOr);
+    BB.UpdateEdge(aNewEdge, aTol);
+    theNewElist.Append(aNewEdge);
+  }
+
+  if (theNewElist.IsEmpty())
+    theNewElist.Assign(theElist);
+
+  //Adjust
+  for (itl.Initialize(theNewElist); itl.More(); itl.Next())
+  {
+    TopoDS_Edge anEdge = TopoDS::Edge(itl.Value());
+    Standard_Real fpar, lpar;
+    Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(anEdge, aFace, fpar, lpar);
+    gp_Pnt2d MidP2d = aPCurve->Value(0.5*(fpar + lpar));
+    Standard_Real aU = MidP2d.X(), aV = MidP2d.Y();
+    if (aU < Ubounds[0] || aU > Ubounds[1])
+    {
+      Standard_Real Period = Ubounds[1] - Ubounds[0];
+      Standard_Real Sign = (aU < Ubounds[0])? 1 : -1;
+      while (aU < Ubounds[0] || aU > Ubounds[1])
+        aU += Sign*Period;
+    }
+    if (aV < Vbounds[0] || aV > Vbounds[1]) //??? sphere? cone?
+    {
+      Standard_Real Period = Vbounds[1] - Vbounds[0];
+      Standard_Real Sign = (aV < Vbounds[0])? 1 : -1;
+      while (aV < Vbounds[0] || aV > Vbounds[1])
+        aV += Sign*Period;
+    }
+    if (aU != MidP2d.X() || aV != MidP2d.Y())
+    {
+      gp_Vec2d OffsetVec(aU - MidP2d.X(), aV - MidP2d.Y());
+      aPCurve->Translate(OffsetVec);
+    }
+  }
+}
+
 //=======================================================================
 //function : Box 
 //purpose  : Calculation of min/max uv of the fillet to intersect.
@@ -447,15 +653,16 @@ ChFiDS_State ChFi3d_EdgeState(TopoDS_Edge* E,
   if (F2.IsNull() || F4.IsNull() || F6.IsNull())
     sst = ChFiDS_FreeBoundary;
   else{
+    BRepOffset_Type aConnectType;
     TopAbs_Orientation o01,o02,o11,o12,o21,o22;
     /*
     i=ChFi3d::ConcaveSide(F[0],F[1],E[0],o01,o02);
     i=ChFi3d::ConcaveSide(F[0],F[2],E[1],o11,o12);
     j=ChFi3d::ConcaveSide(F[1],F[2],E[2],o21,o22);
     */
-    i=ChFi3d::ConcaveSide(F1, F2, E[0], o01, o02);
+    i=ChFi3d::ConcaveSide(F1, F2, E[0], aConnectType, o01, o02);
-    i=ChFi3d::ConcaveSide(F3, F4, E[1], o11, o12);
+    i=ChFi3d::ConcaveSide(F3, F4, E[1], aConnectType, o11, o12);
-    j=ChFi3d::ConcaveSide(F5, F6, E[2], o21, o22);
+    j=ChFi3d::ConcaveSide(F5, F6, E[2], aConnectType, o21, o22);
     
     if(o01==o11 && o02==o21 && o12==o22) sst = ChFiDS_AllSame;
     else if(o12==o22 || i ==10 || j ==10) sst = ChFiDS_OnDiff;
@@ -4743,6 +4950,24 @@ Standard_Integer ChFi3d_NumberOfSharpEdges(const TopoDS_Vertex& Vtx,
   return nba;
 }
 
+//=======================================================================
+//function : IsInSingularity
+//purpose  :
+//
+//=======================================================================
+Standard_Boolean ChFi3d_IsInSingularity(const TopoDS_Vertex& Vtx,
+                                        const ChFiDS_Map& VEMap)
+{
+  TopTools_ListIteratorOfListOfShape ItE;
+  for (ItE.Initialize(VEMap(Vtx)); ItE.More(); ItE.Next())
+  {
+    const TopoDS_Edge& cur = TopoDS::Edge(ItE.Value());
+    if (BRep_Tool::Degenerated(cur))
+      return Standard_True;
+  }
+  return Standard_False;
+}
+
 //=====================================================
 // function cherche_vertex
 // finds common vertex between two edges 

src/ChFi3d/ChFi3d_Builder_0.hxx

@@ -81,6 +81,14 @@ Standard_Real ChFi3d_InPeriod(const Standard_Real U,
 			      const Standard_Real ULast,
 			      const Standard_Real Eps);
 
+void ChFi3d_AdjustSecondPointToFirstPoint(const gp_Pnt2d& theFirstPoint,
+                                          gp_Pnt2d& theSecondPoint,
+                                          const BRepAdaptor_Surface& theSurf);
+
+void ChFi3d_SplitAndAdjust(const TopTools_ListOfShape& theElist,
+                           TopTools_ListOfShape& theNewElist,
+                           const BRepAdaptor_Surface& theBAsurf);
+
 void ChFi3d_Boite(const gp_Pnt2d& p1,const gp_Pnt2d& p2,
 		  Standard_Real& mu,Standard_Real& Mu,
 		  Standard_Real& mv,Standard_Real& Mv);
@@ -565,6 +573,9 @@ Standard_Integer ChFi3d_NumberOfSharpEdges(const TopoDS_Vertex& Vtx,
                                            const ChFiDS_Map& VEMap,
                                            const ChFiDS_Map& EFmap);
 
+Standard_Boolean ChFi3d_IsInSingularity(const TopoDS_Vertex& Vtx,
+                                        const ChFiDS_Map& VEMap);
+
 void ChFi3d_cherche_vertex (const TopoDS_Edge & E1,
 			    const TopoDS_Edge & E2,
 			    TopoDS_Vertex & vertex,

src/ChFi3d/ChFi3d_Builder_1.cxx

@@ -454,7 +454,7 @@ static Standard_Boolean TangentOnVertex(const TopoDS_Vertex&    V,
 //           depending on concavities between neighbour faces of the top.
 //=======================================================================
 
-void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine) 
+void ChFi3d_Builder::PerformExtremity (Handle(ChFiDS_Spine)& Spine) 
 {
   Standard_Integer NbG1Connections = 0;
   

src/ChFi3d/ChFi3d_Builder_2.cxx

@@ -732,8 +732,9 @@ Standard_Boolean ChFi3d_Builder::StripeOrientations
   ff2.Orientation(TopAbs_FORWARD);
   Sb2.Initialize(ff2);
 
+  BRepOffset_Type aConnectType;
   ChoixConge = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(1),
-				   Or1,Or2);
+				   aConnectType,Or1,Or2);
   Or1 = TopAbs::Compose(Or1,Of1);
   Or2 = TopAbs::Compose(Or2,Of2);
   return Standard_True;
@@ -745,7 +746,7 @@ Standard_Boolean ChFi3d_Builder::StripeOrientations
 //purpose  : 
 //=======================================================================
 
-void ChFi3d_Builder::ConexFaces (const Handle(ChFiDS_Spine)&   Spine,
+void ChFi3d_Builder::ConexFaces (Handle(ChFiDS_Spine)&         Spine,
 				 const Standard_Integer        IEdge,
 				 const Standard_Integer        RC,	
 				 Handle(BRepAdaptor_HSurface)& HS1,
@@ -762,9 +763,12 @@ void ChFi3d_Builder::ConexFaces (const Handle(ChFiDS_Spine)&   Spine,
   Sb1.Initialize(ff1);
   Sb2.Initialize(ff2);
 
+  BRepOffset_Type aConnectType = Spine->ConnectType();
   TopAbs_Orientation Or1,Or2;
   Standard_Integer Choix = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(IEdge),
-					       Or1,Or2);  
+					       aConnectType, Or1,Or2);
+  Spine->SetConnectType(aConnectType);
+  
   if (RC%2 != Choix%2) {
     Sb1.Initialize(ff2);
     Sb2.Initialize(ff1);

src/ChFi3d/ChFi3d_Builder_6.cxx

@@ -98,6 +98,7 @@
 #include <TopOpeBRepDS_Surface.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
+#include <BRepLib_MakeEdge.hxx>
 
 #include <stdio.h>
 
@@ -796,6 +797,30 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
   else TraOn1 = ChFi3d_TrsfTrans(lin->TransitionOnS1());
   Fint1.SetInterference(Index1OfCurve,TraOn1,PCurveOnFace,PCurveOnSurf);
 
+  //jgv
+  BRep_Builder BB;
+  TopoDS_Edge Boundary1 = BRepLib_MakeEdge(Crv3d1, pppdeb, pppfin);
+  BB.UpdateEdge(Boundary1, tolcheck);
+  TopLoc_Location aLoc;
+  BB.UpdateEdge(Boundary1, PCurveOnSurf, Surf, aLoc, 0.);
+  BB.UpdateEdge(Boundary1, PCurveOnFace, BS1->ChangeSurface().Face(), 0.);
+  myNewEdges.Add(Boundary1);
+
+  Standard_Integer IndF1;
+  if (!myNewFaces.Contains(BS1->ChangeSurface().Face()))
+    myNewFaces.Add(BS1->ChangeSurface().Face());
+  IndF1 = myNewFaces.FindIndex(BS1->ChangeSurface().Face());
+  if (!myFaceNewEdges.Contains(IndF1))
+  {
+    ChFi3d_ListOfQualifiedEdge aList;
+    myFaceNewEdges.Add(IndF1, aList);
+  }
+  Standard_Integer IndE1 = myNewEdges.FindIndex(Boundary1);
+  TopAbs_Orientation Et = (Reversed)? TopAbs_REVERSED : TopAbs_FORWARD;
+  QualifiedEdge aQE1(IndE1, Et, BRepOffset_Convex);
+  myFaceNewEdges.ChangeFromKey(IndF1).Append(aQE1);
+  /////
+  
   // SurfData is filled in what concerns S2,
   Handle(Geom_Curve) Crv3d2 = Surf->UIso(Uon2);
   gp_Pnt2d pori2(Uon2,0.);
@@ -848,6 +873,27 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
     if(Reversed) TraOn2 = ChFi3d_TrsfTrans(lin->TransitionOnS1());
     else TraOn2 = ChFi3d_TrsfTrans(lin->TransitionOnS2());
     Fint2.SetInterference(Index2OfCurve,TraOn2,PCurveOnFace,PCurveOnSurf);
+
+    //jgv
+    TopoDS_Edge Boundary2 = BRepLib_MakeEdge(Crv3d2, pppdeb, pppfin);
+    BB.UpdateEdge(Boundary2, tolcheck);
+    BB.UpdateEdge(Boundary2, PCurveOnSurf, Surf, aLoc, 0.);
+    BB.UpdateEdge(Boundary2, PCurveOnFace, BS2->ChangeSurface().Face(), 0.);
+    myNewEdges.Add(Boundary2);
+
+    Standard_Integer IndF2;
+    if (!myNewFaces.Contains(BS2->ChangeSurface().Face()))
+      myNewFaces.Add(BS2->ChangeSurface().Face());
+    IndF2 = myNewFaces.FindIndex(BS2->ChangeSurface().Face());
+    if (!myFaceNewEdges.Contains(IndF2))
+    {
+     ChFi3d_ListOfQualifiedEdge aList;
+     myFaceNewEdges.Add(IndF2, aList);
+    }
+    Standard_Integer IndE2 = myNewEdges.FindIndex(Boundary2);
+    QualifiedEdge aQE2(IndE2, TopAbs::Reverse(Et), BRepOffset_Convex);
+    myFaceNewEdges.ChangeFromKey(IndF2).Append(aQE2);
+    /////
   }
   else {
     Handle(Geom2d_Curve) bidpc;

src/ChFi3d/ChFi3d_Builder_C1.cxx

@@ -140,6 +140,7 @@
 #include <TopOpeBRepDS_Transition.hxx>
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+//#include <BOPTools_AlgoTools2D.hxx>
 
 #ifdef OCCT_DEBUG
 # ifdef DRAW
@@ -573,6 +574,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
   if ( ! ChFi3d_SelectStripe (StrIt, Vtx, thePrepareOnSame)) return;
   Handle(ChFiDS_Stripe) stripe = StrIt.Value();
   const Handle(ChFiDS_Spine) spine = stripe->Spine();
+  BRepOffset_Type aConnectType = spine->ConnectType();
   ChFiDS_SequenceOfSurfData& SeqFil =
     stripe->ChangeSetOfSurfData()->ChangeSequence();
   // SurfData and its CommonPoints,
@@ -621,6 +623,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
   BRepAdaptor_Surface& Bs  = HBs->ChangeSurface();
   BRepAdaptor_Surface& Bad = HBad->ChangeSurface();
   BRepAdaptor_Surface& Bop = HBop->ChangeSurface();
+  TopoDS_Edge aNewEdge;
   Handle(Geom_Curve) Cc;
   Handle(Geom2d_Curve) Pc,Ps;
   Standard_Real Ubid,Vbid;//,mu,Mu,mv,Mv;
@@ -631,6 +634,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
   Standard_Integer IFadArc = 1, IFopArc = 2;
   Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
   TopExp_Explorer ex;
+  BRep_Builder BB;
 
 #ifdef OCCT_DEBUG
   ChFi3d_InitChron(ch); // init perf condition  if (onsame)
@@ -731,12 +735,11 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
     TopoDS_Face FFv;
     Standard_Real tol;
     Standard_Integer prol=0;
-    BRep_Builder BRE;
     Handle(Geom_Surface ) Sface;
     Sface=BRep_Tool::Surface(Fv);
     ChFi3d_ExtendSurface(Sface,prol);
     tol=BRep_Tool::Tolerance(Fv);
-    BRE.MakeFace(FFv,Sface,tol);
+    BB.MakeFace(FFv,Sface,tol);
     if (prol) {
       Bs.Initialize(FFv,Standard_False);
       DStr.SetNewSurface(Fv,Sface);
@@ -857,6 +860,21 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
 			      Pc,tolesp,tol2d,tolreached))
       throw Standard_Failure("OneCorner : echec calcul intersection");
 
+    //jgv
+    aNewEdge = BRepLib_MakeEdge(Cc);
+    BB.UpdateEdge(aNewEdge, tolreached);
+    TopLoc_Location aLoc;
+    BB.UpdateEdge(aNewEdge, Ps, DStr.Surface(Fd->Surf()).Surface(), aLoc, 0.);
+    /*
+    Handle(Geom2d_Curve) AdjustedPc;
+    BOPTools_AlgoTools2D::AdjustPCurveOnSurf(Bs, Cc->FirstParameter(), Cc->LastParameter(),
+                                             Pc, AdjustedPc);
+    Pc = AdjustedPc;
+    */
+    BB.UpdateEdge(aNewEdge, Pc, Bs.Face(), 0.);
+    myNewEdges.Add(aNewEdge);
+    /////
+
     Udeb = Cc->FirstParameter();
     Ufin = Cc->LastParameter();
 
@@ -933,12 +951,22 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
 	break;
       }
     }
-
-//
-
-
   }
 
+  Standard_Integer IndFv;
+  if (!myNewFaces.Contains(Fv))
+    myNewFaces.Add(Fv);
+  IndFv = myNewFaces.FindIndex(Fv);
+  if (!myFaceNewEdges.Contains(IndFv))
+  {
+    ChFi3d_ListOfQualifiedEdge aList;
+    myFaceNewEdges.Add(IndFv, aList);
+  }
+  Standard_Integer IndE = myNewEdges.FindIndex(aNewEdge);
+  aConnectType = (onsame)? BRepOffset_Concave : BRepOffset_Convex;
+  QualifiedEdge aQE(IndE, Et, aConnectType);
+  myFaceNewEdges.ChangeFromKey(IndFv).Append(aQE);
+
 #ifdef OCCT_DEBUG
   ChFi3d_ResultChron(ch ,t_inter); //result perf condition if (inter)
   ChFi3d_InitChron(ch); // init perf condition  if (onsame && inters)
@@ -1246,6 +1274,8 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
     Hc = BRep_Tool::CurveOnSurface(Arcprol,Fop,Ubid,Ubid);
     pop1 = Hc->Value(parVtx);
     pop2 = Fiop.PCurveOnFace()->Value(Fiop.Parameter(isfirst));
+    if (!ChFi3d_IsInSingularity(Vtx, myVEMap))
+      ChFi3d_AdjustSecondPointToFirstPoint(pop1, pop2, Bop);
     Hc = BRep_Tool::CurveOnSurface(Arcprol,Fv,Ubid,Ubid);
     pv1 = Hc->Value(parVtx);
     pv2 = p2dbout;
@@ -1268,127 +1298,92 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
 			      zob2dv,tolesp,tol2d,tolreached))
       throw Standard_Failure("OneCorner : echec calcul intersection");
 
+    //jgv
+    TopoDS_Vertex CommonVertexForNewEdgeAndZobEdge = TopExp::FirstVertex(aNewEdge);
+    TopoDS_Edge aZobEdge = BRepLib_MakeEdge(zob3d, Vtx, CommonVertexForNewEdgeAndZobEdge);
+    BB.UpdateEdge(aZobEdge, tolreached);
+    /*
+    Handle(Geom2d_Curve) AdjustedZob2dop;
+    BOPTools_AlgoTools2D::AdjustPCurveOnSurf(Bop, zob3d->FirstParameter(), zob3d->LastParameter(),
+                                             zob2dop, AdjustedZob2dop);
+    zob2dop = AdjustedZob2dop;
+    */
+    BB.UpdateEdge(aZobEdge, zob2dop, Bop.Face(), 0.);
+    /*
+    Handle(Geom2d_Curve) AdjustedZob2dv;
+    BOPTools_AlgoTools2D::AdjustPCurveOnSurf(Bs, zob3d->FirstParameter(), zob3d->LastParameter(),
+                                             zob2dv, AdjustedZob2dv);
+    zob2dv = AdjustedZob2dv;
+    */
+    BB.UpdateEdge(aZobEdge, zob2dv, Bs.Face(), 0.);
+    TopTools_ListOfShape aZobList, aNewZobList;
+    aZobList.Append(aZobEdge);
+    ChFi3d_SplitAndAdjust(aZobList, aNewZobList, Bop);
+    TopTools_ListIteratorOfListOfShape itl(aNewZobList);
+    for (; itl.More(); itl.Next())
+      myNewEdges.Add(itl.Value());
+
     Udeb = zob3d->FirstParameter();
     Ufin = zob3d->LastParameter();
     TopOpeBRepDS_Curve Zob(zob3d,tolreached);
     Standard_Integer IZob = DStr.AddCurve(Zob);
 
-// it is determined if Fop has an edge of sewing 
+    Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolv));
-// it is determined if the curve has an intersection with the edge of sewing
 
-    //TopoDS_Edge edgecouture;
+    Standard_Integer IndFop;
-    //Standard_Boolean couture;
+    if (!myNewFaces.Contains(Fop))
-    ChFi3d_Couture(Fop,couture,edgecouture);
+      myNewFaces.Add(Fop);
-
+    IndFop = myNewFaces.FindIndex(Fop);
-    if (couture  && !BRep_Tool::Degenerated(edgecouture)) {
+    if (!myFaceNewEdges.Contains(IndFop))
-      BRepLib_MakeEdge Bedge (zob3d);
+    {
-      TopoDS_Edge edg =Bedge. Edge();
+      ChFi3d_ListOfQualifiedEdge aList;
-      BRepExtrema_ExtCC extCC (edgecouture,edg);
+      myFaceNewEdges.Add(IndFop, aList);
-      if (extCC.IsDone()&&extCC.NbExt()!=0) {
-        for (Standard_Integer i=1; i<=extCC.NbExt()&&!intcouture;i++) {
-	  if (extCC.SquareDistance(i)<=1.e-8) {
-	    par1=extCC.ParameterOnE1(i);
-	    par2=extCC.ParameterOnE2(i);
-	    gp_Pnt P1=extCC.PointOnE1(i);
-	    TopOpeBRepDS_Point tpoint(P1,1.e-4);
-	    indpt=DStr.AddPoint(tpoint);
-	    intcouture=Standard_True;
-	    curv1 = new Geom_TrimmedCurve(zob3d,Udeb,par2);
-	    curv2 = new Geom_TrimmedCurve(zob3d,par2,Ufin);
-	    TopOpeBRepDS_Curve tcurv1(curv1,tolreached);
-	    TopOpeBRepDS_Curve tcurv2(curv2,tolreached);
-	    Icurv1=DStr.AddCurve(tcurv1);
-	    Icurv2=DStr.AddCurve(tcurv2);
-	  }
-	}
-      }
     }
-    if (intcouture) {
+    for (itl.Initialize(aNewZobList); itl.More(); itl.Next())
-
+    {
-// interference of curv1 and curv2 on Ishape
+      Standard_Integer IndZobE = myNewEdges.FindIndex(itl.Value());
-      Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolv));
+      QualifiedEdge aQzobE(IndZobE, Et, aConnectType);
-      ComputeCurve2d(curv1,Fop,c2d1);
+      myFaceNewEdges.ChangeFromKey(IndFv).Append(aQzobE);
-      Handle(TopOpeBRepDS_SurfaceCurveInterference)
+      QualifiedEdge aQzopEonFop(IndZobE, TopAbs::Reverse(Et), BRepOffset_Convex);
-	InterFv = ChFi3d_FilCurveInDS(Icurv1,IShape,/*zob2dv*/c2d1,Et);
+      myFaceNewEdges.ChangeFromKey(IndFop).Append(aQzopEonFop);
-      DStr.ChangeShapeInterferences(IShape).Append(InterFv);
-      ComputeCurve2d(curv2,Fop,c2d2);
-      InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,/*zob2dv*/c2d2,Et);
-      DStr.ChangeShapeInterferences(IShape).Append(InterFv);
-
-      // limitation of the sewing edge
-      Standard_Integer Iarc=DStr.AddShape(edgecouture);
-      Handle(TopOpeBRepDS_CurvePointInterference) Interfedge;
-      TopAbs_Orientation ori;
-      TopoDS_Vertex Vdeb,Vfin;
-      Vdeb=TopExp::FirstVertex(edgecouture);
-      Vfin=TopExp::LastVertex(edgecouture);
-      Standard_Real pard,parf;
-      pard=BRep_Tool::Parameter(Vdeb,edgecouture);
-      parf=BRep_Tool::Parameter(Vfin,edgecouture);
-      if (Abs(par1-pard)<Abs(parf-par1)) ori=TopAbs_REVERSED;
-      else ori=TopAbs_FORWARD;
-      Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1);
-      DStr.ChangeShapeInterferences(Iarc).Append(Interfedge);
-
-    //  interference of curv1 and curv2 on Iop
-      Standard_Integer Iop = DStr.AddShape(Fop);
-      Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolop));
-      Handle(TopOpeBRepDS_SurfaceCurveInterference)  Interfop;
-      ComputeCurve2d(curv1,Fop,c2d1);
-      Interfop  = ChFi3d_FilCurveInDS(Icurv1,Iop,c2d1,Et);
-      DStr.ChangeShapeInterferences(Iop).Append(Interfop);
-      ComputeCurve2d(curv2,Fop,c2d2);
-      Interfop  = ChFi3d_FilCurveInDS(Icurv2,Iop,c2d2,Et);
-      DStr.ChangeShapeInterferences(Iop).Append(Interfop);
-      Handle(TopOpeBRepDS_CurvePointInterference)
-	interfprol = ChFi3d_FilVertexInDS(TopAbs_FORWARD,Icurv1,IVtx,Udeb);
-      DStr.ChangeCurveInterferences(Icurv1).Append(interfprol);
-      interfprol = ChFi3d_FilPointInDS(TopAbs_REVERSED,Icurv1,indpt,par2);
-      DStr.ChangeCurveInterferences(Icurv1).Append(interfprol);
-      Standard_Integer icc = stripe->IndexPoint(isfirst,IFopArc);
-      interfprol = ChFi3d_FilPointInDS(TopAbs_FORWARD,Icurv2,indpt,par2);
-      DStr.ChangeCurveInterferences(Icurv2).Append(interfprol);
-      interfprol = ChFi3d_FilPointInDS(TopAbs_REVERSED,Icurv2,icc,Ufin);
-      DStr.ChangeCurveInterferences(Icurv2).Append(interfprol);
     }
-    else {
+    
-      Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolv));
+    Handle(TopOpeBRepDS_SurfaceCurveInterference)
-      Handle(TopOpeBRepDS_SurfaceCurveInterference)
+      InterFv = ChFi3d_FilCurveInDS(IZob,IShape,zob2dv,Et);
-	InterFv = ChFi3d_FilCurveInDS(IZob,IShape,zob2dv,Et);
+    DStr.ChangeShapeInterferences(IShape).Append(InterFv);
-      DStr.ChangeShapeInterferences(IShape).Append(InterFv);
+    Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolop));
-      Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolop));
+    Standard_Integer Iop = DStr.AddShape(Fop);
-      Standard_Integer Iop = DStr.AddShape(Fop);
+    Handle(TopOpeBRepDS_SurfaceCurveInterference)
-      Handle(TopOpeBRepDS_SurfaceCurveInterference)
+      Interfop = ChFi3d_FilCurveInDS(IZob,Iop,zob2dop,Et);
-	Interfop = ChFi3d_FilCurveInDS(IZob,Iop,zob2dop,Et);
+    DStr.ChangeShapeInterferences(Iop).Append(Interfop);
-      DStr.ChangeShapeInterferences(Iop).Append(Interfop);
+    Handle(TopOpeBRepDS_CurvePointInterference) interfprol;
-      Handle(TopOpeBRepDS_CurvePointInterference) interfprol;
+#ifdef VARIANT1
-      #ifdef VARIANT1
+    interfprol = ChFi3d_FilVertexInDS(TopAbs_FORWARD,IZob,IVtx,Udeb);
-	interfprol = ChFi3d_FilVertexInDS(TopAbs_FORWARD,IZob,IVtx,Udeb);
+#else 
-      #else 
+    {
-      {
+      Standard_Integer IV2 = DStr.AddShape(V2); // VARIANT 2
-	Standard_Integer IV2 = DStr.AddShape(V2); // VARIANT 2
+      interfprol = ChFi3d_FilVertexInDS(TopAbs_FORWARD,IZob,IV2,Udeb);
-	interfprol = ChFi3d_FilVertexInDS(TopAbs_FORWARD,IZob,IV2,Udeb);
-      }
-      #endif
-      DStr.ChangeCurveInterferences(IZob).Append(interfprol);
-      Standard_Integer icc = stripe->IndexPoint(isfirst,IFopArc);
-      interfprol = ChFi3d_FilPointInDS(TopAbs_REVERSED,IZob,icc,Ufin);
-      DStr.ChangeCurveInterferences(IZob).Append(interfprol);
-      #ifdef VARIANT1 
-      {
-	if (IFopArc == 1) box1.Add( zob3d->Value(Ufin) );
-	else              box2.Add( zob3d->Value(Ufin) );
-      }
-      #else 
-      {
-        // cut off existing Arcprol
-        Standard_Integer iArcprol = DStr.AddShape(Arcprol);
-        interfprol = ChFi3d_FilPointInDS(OVtx,iArcprol,icc,Udeb);
-        DStr.ChangeShapeInterferences(Arcprol).Append(interfprol);
-      }
-      #endif
     }
-  }
+#endif
+    DStr.ChangeCurveInterferences(IZob).Append(interfprol);
+    Standard_Integer icc = stripe->IndexPoint(isfirst,IFopArc);
+    interfprol = ChFi3d_FilPointInDS(TopAbs_REVERSED,IZob,icc,Ufin);
+    DStr.ChangeCurveInterferences(IZob).Append(interfprol);
+#ifdef VARIANT1 
+    {
+      if (IFopArc == 1) box1.Add( zob3d->Value(Ufin) );
+      else              box2.Add( zob3d->Value(Ufin) );
+    }
+#else 
+    {
+      // cut off existing Arcprol
+      Standard_Integer iArcprol = DStr.AddShape(Arcprol);
+      interfprol = ChFi3d_FilPointInDS(OVtx,iArcprol,icc,Udeb);
+      DStr.ChangeShapeInterferences(Arcprol).Append(interfprol);
+    }
+#endif
+  } //if (onsame && inters)
+  
   ChFi3d_EnlargeBox(DStr,stripe,Fd,box1,box2,isfirst);
   if (CV1.IsOnArc()) {
     ChFi3d_EnlargeBox(CV1.Arc(),myEFMap(CV1.Arc()),CV1.ParameterOnArc(),box1);

src/ChFi3d/ChFi3d_ChBuilder.cxx

@@ -202,7 +202,8 @@ void  ChFi3d_ChBuilder::Add(const TopoDS_Edge& E)
     E_wnt.Orientation(TopAbs_FORWARD);
     Spine->SetEdges(E_wnt);
     if(PerformElement(Spine)){
-      PerformExtremity(Spine);
+      //PerformExtremity(Spine);
+      PerformExtremity(Sp);
       Spine->Load();
       myListStripe.Append(Stripe);
     }
@@ -239,8 +240,9 @@ void  ChFi3d_ChBuilder::Add(const Standard_Real Dis,
       BRepAdaptor_Surface Sb1,Sb2;
       Sb1.Initialize(F1);
       Sb2.Initialize(F2);
+      BRepOffset_Type aConnectType;
       TopAbs_Orientation Or1,Or2;
-      ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,Or1,Or2); 
+      ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,aConnectType,Or1,Or2); 
       Handle(ChFiDS_Stripe) Stripe = new ChFiDS_Stripe();
       Handle(ChFiDS_Spine)& Sp = Stripe->ChangeSpine();
       Sp = new ChFiDS_ChamfSpine(tolesp);
@@ -254,7 +256,8 @@ void  ChFi3d_ChBuilder::Add(const Standard_Real Dis,
 	
 	Spine->SetDist(Dis);
 
-	PerformExtremity(Spine);
+	//PerformExtremity(Spine);
+	PerformExtremity(Sp);
       }
     }
   }
@@ -351,8 +354,9 @@ void  ChFi3d_ChBuilder::Add(const Standard_Real Dis1,
       BRepAdaptor_Surface Sb1,Sb2;
       Sb1.Initialize(F1);
       Sb2.Initialize(F2);
+      BRepOffset_Type aConnectType;
       TopAbs_Orientation Or1,Or2;
-      Standard_Integer Choix = ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,Or1,Or2); 
+      Standard_Integer Choix = ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,aConnectType,Or1,Or2); 
 
       Handle(ChFiDS_Stripe) Stripe = new ChFiDS_Stripe();
       Handle(ChFiDS_Spine)& Sp = Stripe->ChangeSpine();
@@ -371,6 +375,7 @@ void  ChFi3d_ChBuilder::Add(const Standard_Real Dis1,
 	Sb2.Initialize(F2);
 	ChoixConge = ChFi3d::ConcaveSide(Sb1,Sb2,
 					 Spine->Edges(1),
+                                         aConnectType,
 					 Or1,Or2);
 
 
@@ -381,7 +386,8 @@ void  ChFi3d_ChBuilder::Add(const Standard_Real Dis1,
 	  Spine->SetDists(Dis2, Dis1);
 	else Spine->SetDists(Dis1, Dis2);
 
-	PerformExtremity(Spine);
+	//PerformExtremity(Spine);
+	PerformExtremity(Sp);
       }
     }
   }
@@ -405,6 +411,7 @@ void  ChFi3d_ChBuilder::SetDists(const Standard_Real    Dis1,
 
     // Search the first edge which has a common face equal to F
     TopoDS_Face F1,F2,FirstF1,FirstF2;
+    BRepOffset_Type aConnectType;
     TopAbs_Orientation Or1,Or2;
     Standard_Integer Choix, ChoixConge;
     BRepAdaptor_Surface Sb1,Sb2;
@@ -429,11 +436,13 @@ void  ChFi3d_ChBuilder::SetDists(const Standard_Real    Dis1,
       Sb2.Initialize(F2);
       Choix = ChFi3d::ConcaveSide(Sb1,Sb2,
 				  csp->Edges(i-1),
+                                  aConnectType,
 				  Or1,Or2);
       Sb1.Initialize(FirstF1);
       Sb2.Initialize(FirstF2);
       ChoixConge = ChFi3d::ConcaveSide(Sb1,Sb2,
 				       csp->Edges(1),
+                                       aConnectType,
 				       Or1,Or2);
       if ( ChoixConge%2 != Choix%2 )
 	csp->SetDists(Dis2,Dis1);
@@ -493,8 +502,9 @@ void  ChFi3d_ChBuilder::AddDA(const Standard_Real Dis1,
       BRepAdaptor_Surface Sb1,Sb2;
       Sb1.Initialize(F1);
       Sb2.Initialize(F2);
+      BRepOffset_Type aConnectType;
       TopAbs_Orientation Or1,Or2;
-      Standard_Integer Choix = ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,Or1,Or2); 
+      Standard_Integer Choix = ChFi3d::ConcaveSide(Sb1,Sb2,E_wnt,aConnectType,Or1,Or2);
 
       Handle(ChFiDS_Stripe) Stripe = new ChFiDS_Stripe();
       Handle(ChFiDS_Spine)& Sp = Stripe->ChangeSpine();
@@ -513,6 +523,7 @@ void  ChFi3d_ChBuilder::AddDA(const Standard_Real Dis1,
 	Sb2.Initialize(F2);
 	ChoixConge = ChFi3d::ConcaveSide(Sb1,Sb2,
 					 Spine->Edges(1),
+                                         aConnectType,
 					 Or1,Or2);
 
 	// compare the 2 computed choices to know how to set the 
@@ -525,7 +536,8 @@ void  ChFi3d_ChBuilder::AddDA(const Standard_Real Dis1,
           Spine->SetDistAngle(Dis1, Angle, Standard_True);
         }
 	
-	PerformExtremity(Spine);
+	//PerformExtremity(Spine);
+	PerformExtremity(Sp);
       }
     }
   }
@@ -549,6 +561,7 @@ void  ChFi3d_ChBuilder::SetDistAngle(const Standard_Real    Dis,
 
     // Search the first edge which has a common face equal to F
     TopoDS_Face F1,F2,FirstF1,FirstF2;
+    BRepOffset_Type aConnectType;
     TopAbs_Orientation Or1,Or2;
     Standard_Integer Choix, ChoixConge;
     BRepAdaptor_Surface Sb1,Sb2;
@@ -575,11 +588,13 @@ void  ChFi3d_ChBuilder::SetDistAngle(const Standard_Real    Dis,
       Sb2.Initialize(F2);
       Choix = ChFi3d::ConcaveSide(Sb1,Sb2,
 				  csp->Edges(i-1),
+                                  aConnectType,
 				  Or1,Or2);
       Sb1.Initialize(FirstF1);
       Sb2.Initialize(FirstF2);
       ChoixConge = ChFi3d::ConcaveSide(Sb1,Sb2,
 				       csp->Edges(1),
+                                       aConnectType,
 				       Or1,Or2);
       if ( ChoixConge%2 != Choix%2 ) {
 	csp->SetDistAngle(Dis, Angle, Standard_False);
@@ -2204,6 +2219,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)&  Spine,
 				   TopoDS_Face&                 F2) const
 {
   BRepAdaptor_Surface Sb1,Sb2;
+  BRepOffset_Type aConnectType;
   TopAbs_Orientation tmp1,tmp2;
   Standard_Integer RC,Choix;
   TopoDS_Face f1,f2,ff1,ff2;
@@ -2215,13 +2231,13 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)&  Spine,
   Sb1.Initialize(ff1);
   ff2.Orientation(TopAbs_FORWARD);
   Sb2.Initialize(ff2);
-  RC = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(1),tmp1,tmp2);
+  RC = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(1),aConnectType,tmp1,tmp2);
 				  
   //calculate the connected faces
   SearchCommonFaces(myEFMap,Spine->Edges(IEdge),f1,f2);
   Sb1.Initialize(f1);
   Sb2.Initialize(f2);
-  Choix = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(IEdge),tmp1,tmp2);
+  Choix = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(IEdge),aConnectType,tmp1,tmp2);
 
   if (RC%2 != Choix%2) {
     F1 = f2;

src/ChFi3d/ChFi3d_FilBuilder.cxx

@@ -209,7 +209,8 @@ void  ChFi3d_FilBuilder::Add(const TopoDS_Edge& E)
     E_wnt.Orientation(TopAbs_FORWARD);
     Spine->SetEdges(E_wnt);
     if(PerformElement(Spine)){
-      PerformExtremity(Spine);
+      //PerformExtremity(Spine);
+      PerformExtremity(Sp);
       Spine->Load();
       myListStripe.Append(Stripe);
     }

src/ChFi3d/ChFi3d_FilBuilder_C2.cxx

@@ -474,8 +474,9 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
 	TopAbs_Orientation oriSFF1 = st1->Orientation(IFaArc1);
 	bid = 1;
 	bid = ChFi3d::NextSide(ori,OFF1,oriS,oriSFF1,bid);
+        BRepOffset_Type aConnectType;
 	TopAbs_Orientation op1 = TopAbs_FORWARD,op2 = TopAbs_FORWARD;
-	if(yapiv) bid = ChFi3d::ConcaveSide(BRS1,BRS2,pivot,op1,op2);
+	if(yapiv) bid = ChFi3d::ConcaveSide(BRS1,BRS2,pivot,aConnectType,op1,op2);
 	op1 = TopAbs::Reverse(op1);
 	op2 = TopAbs::Reverse(op2);
 #ifdef OCCT_DEBUG

src/ChFiDS/ChFiDS_Spine.cxx

@@ -42,6 +42,7 @@ IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_Spine,MMgt_TShared)
 //=======================================================================
 ChFiDS_Spine::ChFiDS_Spine():
        splitdone(Standard_False),
+       myConnectType(BRepOffset_Other),
        tolesp(Precision::Confusion()),
        firstprolon(Standard_False), 
        lastprolon(Standard_False),
@@ -55,6 +56,7 @@ ChFiDS_Spine::ChFiDS_Spine():
 
 ChFiDS_Spine::ChFiDS_Spine(const Standard_Real Tol):
        splitdone(Standard_False),
+       myConnectType(BRepOffset_Other),
        tolesp(Tol),
        firstprolon(Standard_False), 
        lastprolon(Standard_False),

src/ChFiDS/ChFiDS_Spine.hxx

@@ -23,6 +23,7 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <Standard_Integer.hxx>
 #include <ChFiDS_State.hxx>
+#include <BRepOffset_Type.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Standard_Boolean.hxx>
@@ -125,10 +126,16 @@ public:
   
   Standard_EXPORT Standard_Boolean IsClosed() const;
   
+  Standard_EXPORT BRepOffset_Type ConnectType() const;
+  
   Standard_EXPORT Standard_Real FirstParameter() const;
   
   Standard_EXPORT Standard_Real LastParameter() const;
   
+  //! sets the type of connection between faces for all edges of spine:
+  //! it may be Concave, Convex or Other(undefined)
+  Standard_EXPORT void SetConnectType (const BRepOffset_Type theConnectType);
+  
   Standard_EXPORT void SetFirstParameter (const Standard_Real Par);
   
   Standard_EXPORT void SetLastParameter (const Standard_Real Par);
@@ -248,6 +255,7 @@ private:
   ChFiDS_State firstState;
   ChFiDS_State lastState;
   TopTools_SequenceOfShape spine;
+  BRepOffset_Type          myConnectType;
   Handle(TColStd_HArray1OfReal) abscissa;
   Standard_Real tolesp;
   Standard_Real firstparam;

src/ChFiDS/ChFiDS_Spine.lxx

@@ -16,6 +16,16 @@
 
 #include <TopoDS.hxx>
 
+//=======================================================================
+//function : SetConnectType
+//purpose  : 
+//=======================================================================
+
+inline void  ChFiDS_Spine::SetConnectType(const BRepOffset_Type theConnectType)
+{
+  myConnectType = theConnectType;
+}
+
 //=======================================================================
 //function : SetFirstStatus
 //purpose  : 
@@ -36,6 +46,17 @@ inline void  ChFiDS_Spine::SetLastStatus(const ChFiDS_State S)
 {
   lastState = S;
 }
+
+//=======================================================================
+//function : ConnectType
+//purpose  : 
+//=======================================================================
+
+inline BRepOffset_Type  ChFiDS_Spine::ConnectType()const 
+{
+  return myConnectType;
+}
+
 //=======================================================================
 //function : FirstStatus
 //purpose  : 
@@ -46,7 +67,6 @@ inline ChFiDS_State  ChFiDS_Spine::FirstStatus()const
   return firstState;
 }
 
-
 //=======================================================================
 //function : LastStatus
 //purpose  :