kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: creating a NURBS of a circle or ellipse doesn't respect any transformation

Browse Source 
Example:

mat = App.Matrix()
mat.rotateX(1)
mat.rotateY(1)
mat.rotateZ(1)

circle = Part.Circle()
circle.Radius = 5
circle.transform(mat)

circle.transform(mat)
Part.show(circle.toShape())

nurbs = circle.toNurbs()
Part.show(nurbs.toShape())

arc = circle.trim(0, 2)
nurbs = arc.toNurbs()
Part.show(nurbs.toShape())

spline = circle.toBSpline()
Part.show(spline.toShape())

#-------------------------

ellipse = Part.Ellipse()
ellipse.MajorRadius = 5
ellipse.MinorRadius = 3
ellipse.transform(mat)

ellipse.transform(mat)
Part.show(ellipse.toShape())

nurbs = ellipse.toNurbs()
Part.show(nurbs.toShape())

arc = ellipse.trim(0, 2)
nurbs = arc.toNurbs()
Part.show(nurbs.toShape())

spline = ellipse.toBSpline()
Part.show(spline.toShape())
This commit is contained in:
wmayer
2023-02-14 14:34:39 +01:00
committed by wwmayer
parent f34cce97a0
commit 3f72e247ff
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Mod/Part/App/Geometry.cpp
View File

@@ -2244,29 +2244,23 @@ GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const
return GeomConic::toNurbs(first, last);
}
double radius = getRadius();
Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle());
gp_Ax1 axis = conic->Axis();
//gp_Dir xdir = conic->XAxis().Direction();
//Standard_Real angle = gp_Dir(1,0,0).Angle(xdir) + first;
Standard_Real angle = first;
const gp_Pnt& loc = axis.Location();
//Note: If the matching this way doesn't work reliably then we must compute the
//angle so that the point of the curve for 'first' matches the first pole
//gp_Pnt pnt = conic->Value(first);
Handle(Geom_Circle) conic = Handle(Geom_Circle)::DownCast(handle());
double radius = conic->Radius();
TColgp_Array1OfPnt poles(1, 7);
poles(1) = loc.Translated(gp_Vec(radius, 0, 0));
poles(2) = loc.Translated(gp_Vec(radius, 2*radius, 0));
poles(3) = loc.Translated(gp_Vec(-radius, 2*radius, 0));
poles(4) = loc.Translated(gp_Vec(-radius, 0, 0));
poles(5) = loc.Translated(gp_Vec(-radius, -2*radius, 0));
poles(6) = loc.Translated(gp_Vec(radius, -2*radius, 0));
poles(7) = loc.Translated(gp_Vec(radius, 0, 0));
poles(1) = gp_Pnt(radius, 0, 0);
poles(2) = gp_Pnt(radius, 2*radius, 0);
poles(3) = gp_Pnt(-radius, 2*radius, 0);
poles(4) = gp_Pnt(-radius, 0, 0);
poles(5) = gp_Pnt(-radius, -2*radius, 0);
poles(6) = gp_Pnt(radius, -2*radius, 0);
poles(7) = gp_Pnt(radius, 0, 0);
gp_Trsf trsf;
trsf.SetTransformation(conic->Position(), gp_Ax3());
TColStd_Array1OfReal weights(1,7);
for (int i=1; i<=7; i++) {
poles(i).Rotate(axis, angle);
poles(i).Transform(trsf);
weights(i) = 1;
}
weights(1) = 3;
@@ -2285,7 +2279,6 @@ GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const
Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(poles, weights,knots, mults, 3,
Standard_False, Standard_True);
spline->Segment(0, last-first);
return new GeomBSplineCurve(spline);
}
@@ -2671,25 +2664,23 @@ GeomBSplineCurve* GeomEllipse::toNurbs(double first, double last) const
}
Handle(Geom_Ellipse) conic = Handle(Geom_Ellipse)::DownCast(handle());
gp_Ax1 axis = conic->Axis();
Standard_Real majorRadius = conic->MajorRadius();
Standard_Real minorRadius = conic->MinorRadius();
gp_Dir xdir = conic->XAxis().Direction();
Standard_Real angle = atan2(xdir.Y(), xdir.X());
const gp_Pnt& loc = axis.Location();
TColgp_Array1OfPnt poles(1, 7);
poles(1) = loc.Translated(gp_Vec(majorRadius, 0, 0));
poles(2) = loc.Translated(gp_Vec(majorRadius, 2*minorRadius, 0));
poles(3) = loc.Translated(gp_Vec(-majorRadius, 2*minorRadius, 0));
poles(4) = loc.Translated(gp_Vec(-majorRadius, 0, 0));
poles(5) = loc.Translated(gp_Vec(-majorRadius, -2*minorRadius, 0));
poles(6) = loc.Translated(gp_Vec(majorRadius, -2*minorRadius, 0));
poles(7) = loc.Translated(gp_Vec(majorRadius, 0, 0));
poles(1) = gp_Pnt(majorRadius, 0, 0);
poles(2) = gp_Pnt(majorRadius, 2*minorRadius, 0);
poles(3) = gp_Pnt(-majorRadius, 2*minorRadius, 0);
poles(4) = gp_Pnt(-majorRadius, 0, 0);
poles(5) = gp_Pnt(-majorRadius, -2*minorRadius, 0);
poles(6) = gp_Pnt(majorRadius, -2*minorRadius, 0);
poles(7) = gp_Pnt(majorRadius, 0, 0);
gp_Trsf trsf;
trsf.SetTransformation(conic->Position(), gp_Ax3());
TColStd_Array1OfReal weights(1,7);
for (int i=1; i<=7; i++) {
poles(i).Rotate(axis, angle);
poles(i).Transform(trsf);
weights(i) = 1;
}
weights(1) = 3;