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

0023175: Failed to segment a periodic B-Spline when parameter coincides with existing knot

Browse Source
This commit is contained in:
dbv 2012-06-21 17:17:14 +04:00
parent be34de4b94
commit 9d091ec153
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BSplCLib/BSplCLib.cxx
View File

@ -1639,7 +1639,7 @@ Standard_Boolean BSplCLib::PrepareInsertKnots
if (adeltaK1 > Tolerance) return Standard_False; if (adeltaK1 > Tolerance) return Standard_False;
if (adeltaK2 > Tolerance) return Standard_False; if (adeltaK2 > Tolerance) return Standard_False;
Standard_Integer sigma = 0, mult, amult, lastmult = 0; Standard_Integer sigma = 0, mult, amult;
NbKnots = 0; NbKnots = 0;
Standard_Integer k = Knots.Lower() - 1; Standard_Integer k = Knots.Lower() - 1;
Standard_Integer ak = AddKnots.Lower(); Standard_Integer ak = AddKnots.Lower();
@ -1684,18 +1684,15 @@ Standard_Boolean BSplCLib::PrepareInsertKnots
if (Abs(au - Knots(k)) <= Eps) { if (Abs(au - Knots(k)) <= Eps) {
// identic to existing knot // identic to existing knot
mult = Mults(k); mult = Mults(k);
lastmult = mult;//gka
if (Add) { if (Add) {
if (mult + amult > Degree) if (mult + amult > Degree)
amult = Max(0,Degree - mult); amult = Max(0,Degree - mult);
sigma += amult; sigma += amult;
//lastmult = mult + amult;
} }
else if (amult > mult) { else if (amult > mult) {
if (amult > Degree) amult = Degree; if (amult > Degree) amult = Degree;
sigma += amult - mult; sigma += amult - mult;
//lastmult = amult;//gka modified
} }
/* /*
// on periodic curves if this is the last knot // on periodic curves if this is the last knot
@ -1713,7 +1710,6 @@ Standard_Boolean BSplCLib::PrepareInsertKnots
if (amult > 0) { if (amult > 0) {
if (amult > Degree) amult = Degree; if (amult > Degree) amult = Degree;
NbKnots++; NbKnots++;
//lastmult = amult;
sigma += amult; sigma += amult;
} }
} }
@ -1722,9 +1718,6 @@ Standard_Boolean BSplCLib::PrepareInsertKnots
} }
// count the last knots // count the last knots
if (lastmult == 0)// || k < Knots.Upper())
lastmult = Mults(Knots.Upper());
while (k < Knots.Upper()) { while (k < Knots.Upper()) {
k++; k++;
NbKnots++; NbKnots++;
@ -1732,7 +1725,12 @@ Standard_Boolean BSplCLib::PrepareInsertKnots
} }
if (Periodic) { if (Periodic) {
NbPoles = sigma - lastmult; //for periodic B-Spline the requirement is that multiplicites of the first
//and last knots must be equal (see Geom_BSplineCurve constructor for
//instance);
//respectively AddMults() must meet this requirement if AddKnots() contains
//knot(s) coincident with first or last
NbPoles = sigma - Mults(Knots.Upper());
} }
else { else {
NbPoles = sigma - Degree - 1; NbPoles = sigma - Degree - 1;