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

0025662: Project command produce wrong 2dcurve

Browse Source 
Concatenation algorithm fixed to work over periodic bspline surfaces.

Test case for issue CR25662
This commit is contained in:
aml 2015-01-15 15:40:25 +03:00 committed by bugmaster
parent edbf88ba99
commit 460f4f693a
2 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
View File

@ -426,7 +426,9 @@ ProjLib_ComputeApproxOnPolarSurface::ProjLib_ComputeApproxOnPolarSurface
} }
static Handle(Geom2d_BSplineCurve) Concat(Handle(Geom2d_BSplineCurve) C1, static Handle(Geom2d_BSplineCurve) Concat(Handle(Geom2d_BSplineCurve) C1,
Handle(Geom2d_BSplineCurve) C2) Handle(Geom2d_BSplineCurve) C2,
Standard_Real theUJump,
Standard_Real theVJump)
{ {
Standard_Integer deg, deg1, deg2; Standard_Integer deg, deg1, deg2;
deg1 = C1->Degree(); deg1 = C1->Degree();
@ -483,7 +485,8 @@ static Handle(Geom2d_BSplineCurve) Concat(Handle(Geom2d_BSplineCurve) C1,
} }
for (i = 2; i <= np2; i++) { for (i = 2; i <= np2; i++) {
count++; count++;
P(count) = P2(i); P(count).SetX(P2(i).X() + theUJump);
P(count).SetY(P2(i).Y() + theVJump);
} }
Handle(Geom2d_BSplineCurve) BS = Handle(Geom2d_BSplineCurve) BS =
@ -679,11 +682,36 @@ Handle(Geom2d_BSplineCurve) ProjLib_ComputeApproxOnPolarSurface::Perform
Handle(Geom2d_BSplineCurve) CurBS; Handle(Geom2d_BSplineCurve) CurBS;
CurBS = Handle(Geom2d_BSplineCurve)::DownCast(LOfBSpline2d.First()); CurBS = Handle(Geom2d_BSplineCurve)::DownCast(LOfBSpline2d.First());
LOfBSpline2d.RemoveFirst(); LOfBSpline2d.RemoveFirst();
for (Standard_Integer ii = 2; ii <= NbC; ii++) { for (Standard_Integer ii = 2; ii <= NbC; ii++)
Handle(Geom2d_BSplineCurve) BS = {
Handle(Geom2d_BSplineCurve)::DownCast(LOfBSpline2d.First()); Handle(Geom2d_BSplineCurve) BS =
CurBS = Concat(CurBS,BS); Handle(Geom2d_BSplineCurve)::DownCast(LOfBSpline2d.First());
LOfBSpline2d.RemoveFirst();
//Check for period jump in point of contact.
gp_Pnt2d aC1End = CurBS->Pole(CurBS->NbPoles()); // End of C1.
gp_Pnt2d aC2Beg = BS->Pole(1); // Beginning of C2.
Standard_Real anUJump = 0.0, anVJump = 0.0;
if (S->IsUPeriodic() || S->IsUClosed())
{
if (Abs (aC1End.X() - aC2Beg.X()) > (S->LastUParameter() - S->FirstUParameter() ) / 2.01)
{
Standard_Real aMultCoeff = aC2Beg.X() < aC1End.X() ? 1.0 : -1.0;
anUJump = (S->LastUParameter() - S->FirstUParameter() ) * aMultCoeff;
}
}
if (S->IsVPeriodic() || S->IsVClosed())
{
if (Abs (aC1End.Y() - aC2Beg.Y()) > (S->LastVParameter() - S->FirstVParameter() ) / 2.01)
{
Standard_Real aMultCoeff = aC2Beg.Y() < aC1End.Y() ? 1.0 : -1.0;
anVJump = (S->LastVParameter() - S->FirstVParameter() ) * aMultCoeff;
}
}
CurBS = Concat(CurBS,BS, anUJump, anVJump);
LOfBSpline2d.RemoveFirst();
} }
return CurBS; return CurBS;
} }

49
tests/bugs/moddata_3/bug25662 Normal file
View File

@ -0,0 +1,49 @@
puts "================"
puts "OCC25662"
puts "================"
puts ""
#######################################################################
# Project command produce wrong 2dcurve
#######################################################################
restore [locate_data_file bug25662_c3d.draw] c3d
restore [locate_data_file bug25662_surf.draw] surf
project c2d c3d surf
set log [dump c2d]
regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles
puts "Degree=${Degree}"
puts "Poles=${Poles}"
puts "KnotsPoles=${KnotsPoles}"
puts ""
set tol_abs 1.e-7
set tol_rel 0.01
set V_i 0
for {set i 1} {${i} <= ${Poles}} {incr i} {
set V_i_1 ${V_i}
set exp_string " +${i} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)"
regexp ${exp_string} ${log} full U_i V_i
#puts "i=${i} U_i=${U_i} V_i=${V_i}"
if { ${i} == 1 } {
# First pole
puts "V_first=${V_i}"
set expected_V_first 36.9997986855584
checkreal "V_first" ${V_i} ${expected_V_first} ${tol_abs} ${tol_rel}
}
if { ${i} == ${Poles} } {
# Last pole
puts "V_last=${V_i}"
set expected_V_last 55.0007653583147
checkreal "V_last" ${V_i} ${expected_V_last} ${tol_abs} ${tol_rel}
}
if { ${i} > 1 } {
#puts "i=${i} U_i=${U_i} V_i=${V_i} V_i_1=${V_i_1}"
if { ${V_i_1} >= ${V_i} } {
puts "Error: Bad value of V in string: ${i} :${U_i}, ${V_i}"
}
}
}