0022383: Four and more points at least on curve

src/BRepMesh/BRepMesh_FastDiscretFace.cxx

@@ -592,6 +592,28 @@ static void filterParameters(const TColStd_IndexedMapOfReal& theParams,
     isCandidateDefined = Standard_True;
   }
   theResult.Append(aParamTmp.Last());
+  
+  if( theResult.Length() == 2 )
+  {
+    Standard_Real    dist  = theResult.Last() - theResult.First();
+    Standard_Integer nbint = (Standard_Integer)((dist / theFilterDist) + 0.5);
+
+    if( nbint > 1 )
+    {
+      //Five points more is maximum
+      if( nbint > 5 )
+      {
+        nbint = 5;
+      }
+
+      Standard_Integer i;
+      Standard_Real dU = dist / nbint;
+      for( i = 1; i < nbint; i++ )
+      {
+        theResult.InsertAfter(i, theResult.First()+i*dU);
+      }
+    }
+  }
 }
 
 void BRepMesh_FastDiscretFace::InternalVertices(const Handle(BRepAdaptor_HSurface)& theCaro,

src/GCPnts/GCPnts_TangentialDeflection.gxx

@@ -26,8 +26,9 @@ void GCPnts_TangentialDeflection::EvaluateDu (
   Standard_Real LTol = Precision::Confusion ();
   if (Lt > LTol && N.Magnitude () > LTol) {
     Standard_Real Lc = N.CrossMagnitude (T);
-    if (Lc/Lt > LTol) {
+    Standard_Real Ln = Lc/Lt;
-      Du = sqrt (8.0 * curvatureDeflection * Lt / Lc);
+    if (Ln > LTol) {
+      Du = sqrt (8.0 * curvatureDeflection / Ln);
       NotDone = Standard_False;
     }
   }
@@ -233,22 +234,17 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
 
 {
   Standard_Integer i;       
-  Standard_Boolean Correction, TooLarge, TooSmall, MorePoints;
   gp_XYZ V1, V2;
-//  gp_Pnt MiddlePoint, CurrentPoint, LastPoint, PreviousPoint;   
   gp_Pnt MiddlePoint, CurrentPoint, LastPoint;   
-  Standard_Real Coef, ACoef, FCoef, Du, Dusave, MiddleU, L1, L2;
+  Standard_Real Du, Dusave, MiddleU, L1, L2;
 
   Standard_Real U1       = firstu;   
-  Standard_Real U2       = firstu;   
-  Standard_Real AngleMax = angularDeflection * 0.5;  //car on prend le point milieu
   Standard_Real LTol     = Precision::Confusion ();  //protection longueur nulle
   Standard_Real ATol     = Precision::Angular ();    //protection angle nul
 
   D0 (C, lastu, LastPoint);
 
   //Initialization du calcul
-  //---------------------------------------------------------------------
 
   Standard_Boolean NotDone = Standard_True;
   Dusave = (lastu - firstu)*Us3;
@@ -301,7 +297,7 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
           parameters.Remove (i);
           pointsLength--;
         }
-	Du = (lastu-firstu)*Us3;
+        Du = Dusave;
       }
     }
     else  {
@@ -335,8 +331,11 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
   }
 
   //Traitement normal pour une courbe
-  //-------------------------------------------------------------------
+  Standard_Boolean MorePoints = Standard_True;
-  MorePoints = Standard_True;
+  Standard_Real U2            = firstu;   
+  Standard_Real AngleMax      = angularDeflection * 0.5;  //car on prend le point milieu
+
+  gp_Pnt aPrevPoint = points.Last();
 
   while (MorePoints) {
 
@@ -350,18 +349,22 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
     }
     else D0 (C, U2, CurrentPoint);           //Point suivant
 
+    Standard_Real Coef, ACoef, FCoef;
+    Standard_Boolean Correction, TooLarge, TooSmall;
     TooLarge   = Standard_False;
     TooSmall   = Standard_False;
     Correction = Standard_True;
 
+    Standard_Real lastCoef = 0;
+     
     while (Correction) {                     //Ajustement Du
       MiddleU = (U1+U2)*0.5;                 //Verif / au point milieu
       D0 (C, MiddleU, MiddlePoint);
 
       V1 = CurrentPoint.XYZ ();              //Critere de fleche
-      V1.Subtract (points.Last().XYZ());
+      V1.Subtract (aPrevPoint.XYZ());
       V2 = MiddlePoint.XYZ ();
-      V2.Subtract (points.Last().XYZ());
+      V2.Subtract (aPrevPoint.XYZ());
       L1 = V1.Modulus ();
       if (L1 > LTol) FCoef = V1.CrossMagnitude(V2)/(L1*curvatureDeflection);
       else           FCoef = 0.0;
@@ -386,18 +389,24 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
           Correction = Standard_False;
         }
         else {
-	  if (Coef >= 0.75 || TooLarge || TooSmall) { 
+          if (Coef >= 0.55 || TooLarge) { 
             parameters.Append (U2);
             points    .Append (CurrentPoint);
+            aPrevPoint = CurrentPoint;
             Correction = Standard_False;
           }
+          else if (TooSmall) {
+            Correction = Standard_False;
+            aPrevPoint = CurrentPoint;
+          }
           else {
             TooSmall = Standard_True;
-	    Standard_Real UUU2 = U2;
+            lastCoef = Coef;
+            //Standard_Real UUU2 = U2;
             Du += Min((U2-U1)*(1.-Coef), Du*Us3);
 
             U2 = U1 + Du;
-	    if (U2 >= lastu) U2 = UUU2;
+            //if (U2 >= lastu) U2 = UUU2;
             if (U2 >= lastu) {
               parameters.Append (lastu);
               points    .Append (LastPoint);
@@ -476,13 +485,12 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
     points    .SetValue (i, MiddlePoint);
   }
 
-  //-- ------------------------------------------------------------
   //-- On rajoute des points aux milieux des segments si le nombre
   //-- mini de points n'est pas atteint
   //--
   Standard_Integer Nbp =  points.Length();
   Standard_Integer MinNb= (9*minNbPnts)/10;
-  if(MinNb<3) MinNb=3;
+  //if(MinNb<4) MinNb=4;
 
   //-- if(Nbp <  MinNb) { cout<<"\n*"; } else {  cout<<"\n."; } 
   while(Nbp < MinNb) { 
@@ -497,8 +505,3 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
     }
   }
 }
-
-
-
-
-