0030489: Modeling Algorithms - BRepBuilderAPI_GTransform hangs

Approx_ComputeCLine.gxx - criterium to stop interval cutting is increased.
ProjLib_ProjectedCurve.cxx - fix regression for bugs modalg_5 bug25886
Other tests are modified according to current state of algorithm

src/Approx/Approx_ComputeCLine.gxx

@@ -93,11 +93,12 @@ void Approx_ComputeCLine::Perform(const MultiLine& Line)
   Standard_Real thetol3d = Precision::Confusion(), thetol2d = Precision::Confusion();
   UFirst = Line.FirstParameter();
   ULast = Line.LastParameter();
-  Standard_Real TolU = Max((ULast-UFirst)*1.e-05, Precision::PApproximation());
+  Standard_Real TolU = Max((ULast - UFirst)*1.e-03, Precision::Confusion());
   Standard_Real myfirstU = UFirst;
   Standard_Real mylastU = ULast;
   Standard_Integer aMaxSegments = 0;
   Standard_Integer aMaxSegments1 = myMaxSegments - 1;
+  Standard_Integer aNbCut = 0, aNbImp = 0, aNbComp = 5;
 
   if (!mycut)
   {
@@ -130,6 +131,8 @@ void Approx_ComputeCLine::Perform(const MultiLine& Line)
           // Calcul de la partie a approximer.
           myfirstU = mylastU;
           mylastU = ULast;
+          aNbCut = 0;
+          aNbImp = 0;
           if (Abs(ULast - myfirstU) <= RealEpsilon()
               || aMaxSegments >= myMaxSegments)
           {
@@ -151,10 +154,12 @@ void Approx_ComputeCLine::Perform(const MultiLine& Line)
             KeptUlast = mylastU;
             KeptT3d = thetol3d;
             KeptT2d = thetol2d;
+            aNbImp++;
           }
 
           // cut an interval
           mylastU = (myfirstU + mylastU) / 2;
+          aNbCut++;
         }
       }
 
@@ -166,9 +171,16 @@ void Approx_ComputeCLine::Perform(const MultiLine& Line)
       }
 
       //cout << myfirstU << " - " << mylastU << "  tol : " << thetol3d << " " << thetol2d << endl;
-
+      Standard_Boolean aStopCutting = Standard_False;
+      if (aNbCut >= aNbComp)
+      {
+        if (aNbCut > aNbImp)
+        {
+          aStopCutting = Standard_True;
+        }
+      }
       // is new decision better?
-      if (!Ok && (Abs(myfirstU-mylastU) <= TolU || aMaxSegments >= aMaxSegments1))
+      if (!Ok && (Abs(myfirstU - mylastU) <= TolU || aMaxSegments >= aMaxSegments1 || aStopCutting ))
       {
         Ok = Standard_True; // stop interval cutting, approx the rest part
 

src/ProjLib/ProjLib_ProjectedCurve.cxx

@@ -42,6 +42,7 @@
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
+#include <Geom2dConvert.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
@@ -55,6 +56,8 @@
 #include <GeomLib.hxx>
 #include <Extrema_ExtPC.hxx>
 #include <NCollection_DataMap.hxx>
+#include <ElSLib.hxx>
+#include <ElCLib.hxx>
 //=======================================================================
 //function : ComputeTolU
 //purpose  : 
@@ -150,14 +153,15 @@ static void TrimC3d(Handle(Adaptor3d_HCurve)& myCurve,
                     const Standard_Real dt,
                     const gp_Pnt& Pole,
                     Standard_Integer* SingularCase,
-                    const Standard_Integer NumberOfSingularCase)
+                    const Standard_Integer NumberOfSingularCase,
+                    const Standard_Real TolConf)
 {
   Standard_Real f = myCurve->FirstParameter();
   Standard_Real l = myCurve->LastParameter();
 
   gp_Pnt P = myCurve->Value(f);
 
-  if(P.Distance(Pole) < Precision::Confusion()) {
+  if(P.Distance(Pole) <= TolConf) {
     IsTrimmed[0] = Standard_True;
     f = f+dt;
     myCurve = myCurve->Trim(f, l, Precision::Confusion());
@@ -165,7 +169,7 @@ static void TrimC3d(Handle(Adaptor3d_HCurve)& myCurve,
   }
   
   P = myCurve->Value(l);
-  if(P.Distance(Pole) < Precision::Confusion()) {
+  if(P.Distance(Pole) <= TolConf) {
     IsTrimmed[1] = Standard_True;
     l = l-dt;
     myCurve = myCurve->Trim(f, l, Precision::Confusion());
@@ -232,7 +236,13 @@ static void ExtendC2d (Handle(Geom2d_BSplineCurve)& aRes,
     }
   }
   gp_Lin2d BoundLin(thePole, theBoundDir); //one of the bounds of rectangle
-
+  Standard_Real ParOnLin = 0.;
+  if (theBoundDir.IsParallel(aDBnd, 100.*Precision::Angular()))
+  {
+    ParOnLin = ElCLib::Parameter(aLin, thePole);
+  }
+  else
+  {
     Standard_Real U1x = BoundLin.Direction().X();
     Standard_Real U1y = BoundLin.Direction().Y();
     Standard_Real U2x = aLin.Direction().X();
@@ -242,7 +252,8 @@ static void ExtendC2d (Handle(Geom2d_BSplineCurve)& aRes,
 
     Standard_Real D = U1y*U2x - U1x*U2y;
 
-  Standard_Real ParOnLin = (Uo21y * U1x - Uo21x * U1y)/D; //parameter of intersection point
+    ParOnLin = (Uo21y * U1x - Uo21x * U1y) / D; //parameter of intersection point
+  }
   
   Handle(Geom2d_Line) aSegLine = new Geom2d_Line(aLin);
   aSegment = (FirstOrLast == 0)?
@@ -392,6 +403,16 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
   GeomAbs_SurfaceType SType = mySurface->GetType();
   GeomAbs_CurveType   CType = myCurve->GetType();
   Standard_Boolean isAnalyticalSurf = Standard_True;
+  Standard_Boolean IsTrimmed[2] = { Standard_False, Standard_False };
+  Standard_Integer SingularCase[2];
+  const Standard_Real eps = 0.01;
+  Standard_Real TolConf = Precision::Confusion();
+  Standard_Real dt = (LastPar - FirstPar) * eps;
+  Standard_Real U1 = 0.0, U2 = 0.0, V1 = 0.0, V2 = 0.0;
+  U1 = mySurface->FirstUParameter();
+  U2 = mySurface->LastUParameter();
+  V1 = mySurface->FirstVParameter();
+  V2 = mySurface->LastVParameter();
 
   switch (SType)
   {
@@ -429,6 +450,28 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
           // periodique en V !)
           P.SetInBounds(myCurve->FirstParameter());
         }
+        else
+        {
+          const Standard_Real Vmax = M_PI / 2.;
+          const Standard_Real Vmin = -Vmax;
+          const Standard_Real minang = 1.e-5 * M_PI;
+          gp_Sphere aSph = mySurface->Sphere();
+          Standard_Real anR = aSph.Radius();
+          Standard_Real f = myCurve->FirstParameter();
+          Standard_Real l = myCurve->LastParameter();
+
+          gp_Pnt Pf = myCurve->Value(f);
+          gp_Pnt Pl = myCurve->Value(l);
+          gp_Pnt aLoc = aSph.Position().Location();
+          Standard_Real maxdist = Max(Pf.Distance(aLoc), Pl.Distance(aLoc));
+          TolConf = Max(anR * minang, Abs(anR - maxdist));
+
+          //Surface has pole at V = Vmin and Vmax
+          gp_Pnt Pole = mySurface->Value(U1, Vmin);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 3, TolConf);
+          Pole = mySurface->Value(U1, Vmax);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 4, TolConf);
+        }
         myResult = P;
       }
       break;
@@ -445,15 +488,11 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
     case GeomAbs_BSplineSurface:
       {
         isAnalyticalSurf = Standard_False;
-        Standard_Boolean IsTrimmed[2] = {Standard_False, Standard_False};
+        Standard_Real f, l;
-        Standard_Integer SingularCase[2];
-        Standard_Real f, l, dt;
-        const Standard_Real eps = 0.01;
         f = myCurve->FirstParameter();
         l = myCurve->LastParameter();
         dt = (l - f) * eps;
 
-        Standard_Real U1 = 0.0, U2=0.0, V1=0.0, V2=0.0;
         const Adaptor3d_Surface& S = mySurface->Surface();
         U1 = S.FirstUParameter();
         U2 = S.LastUParameter();
@@ -464,28 +503,28 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
         {
           //Surface has pole at U = Umin
           gp_Pnt Pole = mySurface->Value(U1, V1);
-          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 1);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 1, TolConf);
         }
 
         if(IsoIsDeg(S, U2, GeomAbs_IsoU, 0., myTolerance))
         {
           //Surface has pole at U = Umax
           gp_Pnt Pole = mySurface->Value(U2, V1);
-          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 2);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 2, TolConf);
         }
 
         if(IsoIsDeg(S, V1, GeomAbs_IsoV, 0., myTolerance))
         {
           //Surface has pole at V = Vmin
           gp_Pnt Pole = mySurface->Value(U1, V1);
-          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 3);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 3, TolConf);
         }
 
         if(IsoIsDeg(S, V2, GeomAbs_IsoV, 0., myTolerance))
         {
           //Surface has pole at V = Vmax
           gp_Pnt Pole = mySurface->Value(U1, V2);
-          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 4);
+          TrimC3d(myCurve, IsTrimmed, dt, Pole, SingularCase, 4, TolConf);
         }
 
         ProjLib_ComputeApproxOnPolarSurface polar;
@@ -531,10 +570,9 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
     default:
       {
         isAnalyticalSurf = Standard_False;
-        Standard_Boolean IsTrimmed[2] = {Standard_False, Standard_False};
         Standard_Real Vsingular[2] = {0.0 , 0.0}; //for surfaces of revolution
-        Standard_Real f = 0.0, l = 0.0, dt = 0.0;
+        Standard_Real f = 0.0, l = 0.0;
-        const Standard_Real eps = 0.01;
+        dt = 0.0;
 
         if(mySurface->GetType() == GeomAbs_SurfaceOfRevolution)
         {
@@ -714,7 +752,39 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
     if (Comp.Bezier().IsNull() && Comp.BSpline().IsNull())
       return; // advanced projector has been failed too
     myResult.Done();
-
+    Handle(Geom2d_BSplineCurve) aRes;
+    if (Comp.BSpline().IsNull())
+    {
+      aRes = Geom2dConvert::CurveToBSplineCurve(Comp.Bezier());
+    }
+    else
+    {
+      aRes = Comp.BSpline();
+    }
+    if ((IsTrimmed[0] || IsTrimmed[1]))
+    {
+      if (IsTrimmed[0])
+      {
+        //Add segment before start of curve
+        Standard_Real f = myCurve->FirstParameter();
+        ExtendC2d(aRes, f, -dt, U1, U2, V1, V2, 0, SingularCase[0]);
+      }
+      if (IsTrimmed[1])
+      {
+        //Add segment after end of curve
+        Standard_Real l = myCurve->LastParameter();
+        ExtendC2d(aRes, l, dt, U1, U2, V1, V2, 1, SingularCase[1]);
+      }
+      Handle(Geom2d_Curve) NewCurve2d;
+      GeomLib::SameRange(Precision::PConfusion(), aRes,
+        aRes->FirstParameter(), aRes->LastParameter(),
+        FirstPar, LastPar, NewCurve2d);
+      aRes = Handle(Geom2d_BSplineCurve)::DownCast(NewCurve2d);
+      myResult.SetBSpline(aRes);
+      myResult.SetType(GeomAbs_BSplineCurve);
+    }
+    else
+    {
       // set the type
       if (SType == GeomAbs_Plane && CType == GeomAbs_BezierCurve)
       {
@@ -726,6 +796,7 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C)
         myResult.SetType(GeomAbs_BSplineCurve);
         myResult.SetBSpline(Comp.BSpline());
       }
+    }
     // set the periodicity flag
     if (SType == GeomAbs_Plane        &&
       CType == GeomAbs_BSplineCurve &&

tests/bugs/modalg_5/bug25886

@@ -6,8 +6,8 @@ puts ""
 # Wrong result obtained by projection algorithm
 #################################################
 
-set ok_len_c3x "3.28347"
+set ok_len_c3x "1.57079"
-set ok_len_c5x "3.28346"
+set ok_len_c5x "1.57079"
 
 smallview -2D-
 

tests/lowalgos/intss/bug26576_1

@@ -26,7 +26,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Tolerance_
 
 set GoodNbCurv 2
 
-set expected_Tolerance_Reached 1.2482990218170969e-007
+set expected_Tolerance_Reached 1.042095984078466e-05
 set tol_abs_Tolerance_Reached 1.0e-7
 set tol_rel_Tolerance_Reached 0.0
 checkreal "Tolerance Reached" ${Tolerance_Reached} ${expected_Tolerance_Reached} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached}

tests/lowalgos/intss/bug26576_3

@@ -31,7 +31,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Tolerance_
 
 set GoodNbCurv 2
 
-set expected_Tolerance_Reached 1.2482990218170969e-007
+set expected_Tolerance_Reached 1.0420959841458885e-05
 set tol_abs_Tolerance_Reached 1.0e-7
 set tol_rel_Tolerance_Reached 0.0
 checkreal "Tolerance Reached" ${Tolerance_Reached} ${expected_Tolerance_Reached} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached}

tests/lowalgos/intss/bug26684_1

@@ -26,6 +26,6 @@ checkreal "Reached tolerance" ${Tolerance} 5.8654166482879483e-009 1.e-7 0
 set bop_info_2d [bopcurves f1 f2 -2d]
 regexp {Tolerance Reached=([-0-9.+eE]+)} $bop_info_2d full Tolerance_2d
 
-checkreal "Reached tolerance" ${Tolerance_2d} 1.4569392656749484e-008 1.e-7 0
+checkreal "Reached tolerance" ${Tolerance_2d} 1.4915699300398263e-07 1.e-7 0
 
 checkview -screenshot -2d -path ${imagedir}/${test_image}.png

tests/lowalgos/intss/bug26684_2

@@ -26,6 +26,6 @@ checkreal "Reached tolerance" ${Tolerance} 1.2530391548405894e-008 1.e-7 0
 set bop_info_2d [bopcurves f1 f2 -2d]
 regexp {Tolerance Reached=([-0-9.+eE]+)} $bop_info_2d full Tolerance_2d
 
-checkreal "Reached tolerance" ${Tolerance_2d} 1.4134494834137484e-005 0 1.e-2
+checkreal "Reached tolerance" ${Tolerance_2d} 0.00040497924613267194 0 1.e-2
 
 checkview -screenshot -2d -path ${imagedir}/${test_image}.png

tests/perf/modalg/bug30489

@@ -0,0 +1,19 @@
+puts "============"
+puts "BUC30489"
+puts "============"
+puts ""
+###############################
+## 0030489: Modeling Algorithms - BRepBuilderAPI_GTransform hangs
+###############################
+
+
+restore [locate_data_file bug30489.brep] a
+dchrono h restart
+scalexyz r a 1. 1. 1.
+dchrono h stop counter scalexyz
+
+checkprops r -s 2.86706e+007
+checkshape r
+checkview -display r -2d -path ${imagedir}/${test_image}.png
+
+