0026470: BRepFill_Evolved: exception and invalid result

Test-cases for issue #26470

src/BRepFill/BRepFill_ApproxSeewing.cxx

@@ -97,6 +97,14 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
   MP.SetPoint2d(3, PF2);
   MLS.SetValue (1, MP);
 
+#ifdef DUMP_ML
+  i = 1;
+  cout << "--Point " << i << endl;
+  cout << "P3d:    " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
+  cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
+#endif
+
+  
   Standard_Real DCorde = Length / ( NbPoints - 1); 
   Standard_Real Corde  = DCorde;
   Standard_Integer Index = 1;
@@ -107,6 +115,11 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
     U = LP(Index-1).Y() + Alpha * ( LP(Index).Y() - LP(Index-1).Y());
     AppDef_MultiPointConstraint MPC( 1, 2);
     ML.Value3dOnF1OnF2(U,P3d,PF1,PF2);
+#ifdef DUMP_ML
+    cout << "--Point " << i << endl;
+    cout << "P3d:    " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
+    cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
+#endif
     MPC.SetPoint  (1, P3d);
     MPC.SetPoint2d(2, PF1);
     MPC.SetPoint2d(3, PF2);
@@ -115,6 +128,12 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
   }
   AppDef_MultiPointConstraint MPE( 1, 2);
   ML.Value3dOnF1OnF2(U2,P3d,PF1,PF2);
+#ifdef DUMP_ML
+  i = NbPoints;
+  cout << "--Point " << i << endl;
+  cout << "P3d:    " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
+  cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
+#endif
   MPE.SetPoint  (1, P3d);
   MPE.SetPoint2d(2, PF1);
   MPE.SetPoint2d(3, PF2);

src/BRepFill/BRepFill_Evolved.cxx

@@ -113,6 +113,7 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+//#define DRAW
 #ifdef DRAW
 #include <DBRep.hxx>
 #include <DrawTrSurf.hxx>
@@ -1120,7 +1121,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
             if (AffichEdge) {
               char name[100];
               sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);	
-	      DBRep::Set(name,S.Value(k));
+              DBRep::Set(name,aSeqOfShape.Value(k));
             }
 #endif	    
           }
@@ -1158,7 +1159,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
           if (AffichEdge) {	  
             char name[100];
             sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);	
-	    DBRep::Set(name,S.Value(k));
+            DBRep::Set(name,aSeqOfShape.Value(k));
           }
 #endif
         }
@@ -1686,6 +1687,7 @@ const
 
     TopoDS_Wire NW;
     B.MakeWire (NW);
+    Standard_Boolean IsClosed = IteF.Value().Closed();
 
     for (TopoDS_Iterator IteW(IteF.Value()); IteW.More(); IteW.Next()) {
 
@@ -1713,6 +1715,7 @@ const
         }
       }
     }
+    NW.Closed(IsClosed);
     B.Add(WorkSpine, NW);
   }
 

src/BRepFill/BRepFill_MultiLine.cxx

@@ -109,6 +109,10 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
   myBis  (Bissec),
   myKPart(0)
 {
+  //
+  const Standard_Real mult = 5.;
+  const Standard_Real eps = mult * Precision::Confusion();
+  //
   myNbPnt2d = 2;
   myNbPnt = 1;
 
@@ -165,7 +169,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU1 = S->UIso(Umin);
       GeomAdaptor_Curve Dummy(UU1);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU1 = S->UIso(Umax);
       }
     }
@@ -173,7 +177,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU1 = S->UIso(Umax);
       GeomAdaptor_Curve Dummy(UU1);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU1 = S->UIso(Umin);
       }
     }
@@ -184,7 +188,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU1 = S->VIso(Vmin);    
       GeomAdaptor_Curve Dummy(UU1);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU1 = S->VIso(Vmax);
       }
     }
@@ -192,7 +196,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU1 = S->VIso(Vmax);
       GeomAdaptor_Curve Dummy(UU1);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU1 = S->VIso(Vmin);
       }
     }
@@ -281,7 +285,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU2 = S->UIso(Umin);    
       GeomAdaptor_Curve Dummy(UU2);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU2 = S->UIso(Umax);
       }
     }
@@ -289,7 +293,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU2 = S->UIso(Umax);
       GeomAdaptor_Curve Dummy(UU2);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU2 = S->UIso(Umin);
       }
     }
@@ -300,7 +304,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU2 = S->VIso(Vmin);
       GeomAdaptor_Curve Dummy(UU2);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU2 = S->VIso(Vmax);
       }
     }
@@ -308,7 +312,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
       UU2 = S->VIso(Vmax);
       GeomAdaptor_Curve Dummy(UU2);
       if (Dummy.GetType() == GeomAbs_Circle && 
-	  Dummy.Circle().Radius() < Precision::Confusion()) {
+        Dummy.Circle().Radius() < eps) {
           UU2 = S->VIso(Vmin);
       }
     }
@@ -373,11 +377,11 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face&     Face1,
     gp_Pnt2d aPnt1 = ValueOnF1(myBis.FirstParameter() + 0.1*DeltaU);
     gp_Pnt2d aPnt2 = ValueOnF1(myBis.FirstParameter() + 0.9*DeltaU);
     if ( myIsoU1) {
-      if ( Abs(aPnt1.Y() - aPnt2.Y()) < Precision::Confusion())
+      if ( Abs(aPnt1.Y() - aPnt2.Y()) < eps)
         myKPart = 1;
     }
     else {
-      if ( Abs(aPnt1.X() - aPnt2.X()) < Precision::Confusion())
+      if ( Abs(aPnt1.X() - aPnt2.X()) < eps)
         myKPart = 1;
     }
 
@@ -601,7 +605,10 @@ static gp_Pnt2d ValueOnFace(const Standard_Real        U,
     //    DrawTrSurf::Set("PP1",P);
   }
 #endif
-
+  //
+  const Standard_Real mult = 5.;
+  const Standard_Real eps = mult * Precision::Confusion();
+  //
   Standard_Real UU =0., Dist = Precision::Infinite(), D1, D2;
 
   if ( Ext.NbPoints() != 0 ) {
@@ -612,8 +619,8 @@ static gp_Pnt2d ValueOnFace(const Standard_Real        U,
   D1 = P.Distance(TheU.Value(TheU.FirstParameter()));
   D2 = P.Distance(TheU.Value(TheU.LastParameter()));
 
-  if (D1 < Dist || D2 < Dist) {
+  if (D1 < Dist || D2 < Dist || Abs(D1 - Dist) < eps || Abs(D2 - Dist) < eps) {
-    if ( Abs( D1 - D2) < Precision::Confusion()) {
+    if ( Abs( D1 - D2) < eps) {
       if ( TheU.GetType() == GeomAbs_Circle) {
         gp_Vec2d Axis = TheU.Circle().XAxis().Direction();
         gp_Vec2d D12d = TheBis.DN(TheBis.FirstParameter(),1);
@@ -641,7 +648,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real        U,
     }
   }
 
-  Standard_Real Tol = Precision::Confusion();
+  const Standard_Real Tol = Precision::Confusion();
   Standard_Real VV;
 
   gp_Pnt2d PF = TheV.Value(TheV.FirstParameter());

src/BRepFill/BRepFill_TrimSurfaceTool.cxx

@@ -63,6 +63,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+//#define DRAW
 #include <stdio.h>
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
@@ -70,7 +71,7 @@
 #endif
 #ifdef OCCT_DEBUG
 static Standard_Boolean Affich       = Standard_False;
-static Standard_Integer NBCALL  = 1;
+static Standard_Integer NBCALL  = 0;
 #endif
 
 //=======================================================================
@@ -101,8 +102,8 @@ myBis  (Bis)
 {
 #ifdef OCCT_DEBUG
   if ( Affich) {
+    NBCALL++;
     cout << " ---------->TrimSurfaceTool : NBCALL = " << NBCALL << endl;
-    
 #ifdef DRAW
     char name[256];
 
@@ -121,7 +122,6 @@ myBis  (Bis)
     sprintf(name,"BISSEC_%d",NBCALL);
     DrawTrSurf::Set(name,myBis);
 #endif    
-    NBCALL++;
   }
 #endif
 }
@@ -404,6 +404,18 @@ void BRepFill_TrimSurfaceTool::IntersectWith
   TColgp_SequenceOfPnt& Points   ) 
   const 
 {
+#ifdef DRAW
+  if ( Affich) {
+    char name[256];  
+    Standard_Integer i1 = 0, i2 = 2;
+    sprintf(name,"EdgeOnF1_%d_%d",i1, NBCALL);
+    DBRep::Set(name,EdgeOnF1);
+
+    sprintf(name,"EdgeOnF2_%d_%d",i2, NBCALL);
+    DBRep::Set(name,EdgeOnF2);
+  }
+
+#endif 
   Points.Clear();
   TColgp_SequenceOfPnt Points2;
 

tests/bugs/modalg_6/bug26470_1

@@ -0,0 +1,11 @@
+puts "========"
+puts "OCC26470"
+puts "========"
+puts ""
+##################################################
+# BRepFill_Evolved: exception and invalid result
+##################################################
+
+restore [locate_data_file OCC26470-ClosedWire.brep] a
+restore [locate_data_file OCC26470-wprof1.brep] b
+evolved res a b o

tests/bugs/modalg_6/bug26470_2

@@ -0,0 +1,12 @@
+puts "========"
+puts "OCC26470"
+puts "========"
+puts ""
+##################################################
+# BRepFill_Evolved: exception and invalid result
+##################################################
+
+restore [locate_data_file OCC26470-ClosedWire.brep] a
+restore [locate_data_file OCC26470-wprof2.brep] b
+evolved res a b o
+checkshape res