OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0026871: [Regression in 6.9.0] Projecting a curve hangs inside Approx_FitAndDivide2d

Browse Source 
Fix checking of B-spline parametrization speed

Test case for issue CR26871
This commit is contained in:
azv 2015-11-17 16:46:32 +03:00 committed by bugmaster
parent ce48b00930
commit 6a2ee09493
2 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
View File

@ -272,7 +272,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
// 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.
@ -286,24 +285,44 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
}
}
GeomAdaptor_Curve aC3DAdaptor(c3d);
for(; anIdx <= bspl->NbKnots() && aFirstParam < Last; anIdx++)
{
// Fill current knot interval.
aLastParam = Min(Last, bspl->Knot(anIdx));
Standard_Integer aNbIntPnts = NCONTROL;
// Number of inner points is adapted according to the length of the interval
// to avoid a lot of calculations on small range of parameters.
if (anIdx > 1)
{
const Standard_Real aLenThres = 1.e-2;
const Standard_Real aLenRatio =
(aLastParam - aFirstParam) / (bspl->Knot(anIdx) - bspl->Knot(anIdx - 1));
if (aLenRatio < aLenThres)
{
aNbIntPnts = Standard_Integer(aLenRatio / aLenThres * aNbIntPnts);
if (aNbIntPnts < 2)
aNbIntPnts = 2;
}
}
Standard_Real aStep = (aLastParam - aFirstParam) / (aNbIntPnts - 1);
Standard_Integer anIntIdx;
gp_Pnt p3d1, p3d2;
// Start filling from first point.
aC3DAdaptor.D0(aFirstParam, p3d1);
Standard_Real aLength3d = 0.0;
for(anIntIdx = 0; anIntIdx < aNbIntPnts - 1; anIntIdx++)
for(anIntIdx = 1; anIntIdx < aNbIntPnts; 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);
Standard_Real aParam = aFirstParam + aStep * anIntIdx;
aC3DAdaptor.D0 (aParam, p3d2);
aLength3d += p3d2.Distance(p3d1);
p3d1 = p3d2;
}
aKnotCoeffs.Append(aLength3d / (aLastParam - aFirstParam));
const Standard_Real aCoeff = aLength3d / (aLastParam - aFirstParam);
if (Abs(aCoeff) > gp::Resolution())
aKnotCoeffs.Append(aCoeff);
aFirstParam = aLastParam;
}

30
tests/bugs/heal/bug26871 Normal file
View File

@ -0,0 +1,30 @@
puts "======="
puts "OCC26871"
puts "======="
puts ""
#########################################################
## Projecting a curve hangs inside Approx_FitAndDivide2d
#########################################################
pload QAcommands
set max_time 5
restore [locate_data_file bug26871_curve3d] c3d
restore [locate_data_file bug26871_surface] surf
dchrono cr reset
dchrono cr start
OCC24008 c3d surf
dchrono cr stop
set logTime [dchrono cr show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} $logTime full z
if { $z > ${max_time} } {
puts "Elapsed time ($z) is more than ${max_time} seconds - Error"
} else {
puts "Elapsed time ($z) is less than ${max_time} seconds - OK"
}