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

Modeling - Degenerated curves were not handled by Arrange function (#396)

Browse Source
This commit is contained in:
Markus Freilinger 2025-03-02 17:47:06 +01:00 committed by GitHub
parent 4556423a04
commit df546f5aca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/GeomFill/GeomFill_BSplineCurves.cxx
View File

@ -34,8 +34,8 @@
//======================================================================= //=======================================================================
// function : Arrange // function : Arrange
// purpose : Internal Use Only // purpose : Internal Use Only
// This function is used to prepare the Filling: The Curves // This function is used to prepare the Filling: The Curves
// are arranged in this way: // are arranged in this way:
// CC3 // CC3
// ----->----- // ----->-----
// | | // | |
@ -46,6 +46,10 @@
// | | // | |
// ----->----- // ----->-----
// CC1 = C1 // CC1 = C1
//
// In case a curve CCx is degenerated to start and end at
// the same point, it is inserted before the curvature leaves
// the point.
//======================================================================= //=======================================================================
static Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1, static Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1,
const Handle(Geom_BSplineCurve)& C2, const Handle(Geom_BSplineCurve)& C2,
@ -70,26 +74,51 @@ static Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1,
for (i = 1; i <= 3; i++) for (i = 1; i <= 3; i++)
{ {
Trouve = Standard_False; Trouve = Standard_False;
// search for a degenerated curve = point, which would match first
for (j = i; j <= 3 && !Trouve; j++) for (j = i; j <= 3 && !Trouve; j++)
{ {
if (GC[j]->StartPoint().Distance(GC[i - 1]->EndPoint()) < Tol) if (GC[j]->StartPoint().Distance(GC[j]->EndPoint()) < Tol)
{ {
Dummy = GC[i]; // this is a degenerated line, does it match the last endpoint?
GC[i] = GC[j]; if (GC[j]->StartPoint().Distance(GC[i - 1]->EndPoint()) < Tol)
GC[j] = Dummy; {
Trouve = Standard_True; Dummy = GC[i];
} GC[i] = GC[j];
else if (GC[j]->EndPoint().Distance(GC[i - 1]->EndPoint()) < Tol) GC[j] = Dummy;
{ Trouve = Standard_True;
GC[j] = Handle(Geom_BSplineCurve)::DownCast(GC[j]->Reversed()); }
Dummy = GC[i];
GC[i] = GC[j];
GC[j] = Dummy;
Trouve = Standard_True;
} }
} }
// if no degenerated curve matched, try an ordinary one as next curve
if (!Trouve) if (!Trouve)
{
for (j = i; j <= 3 && !Trouve; j++)
{
if (GC[j]->StartPoint().Distance(GC[i - 1]->EndPoint()) < Tol)
{
Dummy = GC[i];
GC[i] = GC[j];
GC[j] = Dummy;
Trouve = Standard_True;
}
else if (GC[j]->EndPoint().Distance(GC[i - 1]->EndPoint()) < Tol)
{
GC[j] = Handle(Geom_BSplineCurve)::DownCast(GC[j]->Reversed());
Dummy = GC[i];
GC[i] = GC[j];
GC[j] = Dummy;
Trouve = Standard_True;
}
}
}
// if still non matched -> error, the algorithm cannot finish
if (!Trouve)
{
return Standard_False; return Standard_False;
}
} }
CC1 = GC[0]; CC1 = GC[0];