ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

testing GCE2d_MakeArcOfCircle for Arc

Browse Source
This commit is contained in:
shirnschall 2021-08-11 23:02:49 +02:00
parent 561dadb877
commit 2449b4c79c
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/occ/python_occ_shapes.cpp
View File

@ -29,6 +29,7 @@
#include <GC_MakeSegment.hxx>
#include <GC_MakeCircle.hxx>
#include <GC_MakeArcOfCircle.hxx>
#include <GCE2d_MakeArcOfCircle.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_Transform.hxx>
@ -158,28 +159,28 @@ public:
return shared_from_this();
}
auto ArcTo (double h, double v, const gp_Vec tangv, double angle)
auto ArcTo (double h, double v, const gp_Vec2d tangv, double angle)
{
double newAngle = fmod(angle,360)<180?fmod(angle,360):(-360+fmod(angle,360));
double newAngle = fmod(angle,360);
gp_Dir2d dir = localpos.Direction();
gp_Pnt2d old2d = localpos.Location();
gp_Pnt oldp = axis.Location() . Translated(old2d.X() * axis.XDirection() + old2d.Y() * axis.YDirection());
//gp_Pnt oldp = axis.Location() . Translated(old2d.X() * axis.XDirection() + old2d.Y() * axis.YDirection());
localpos.SetLocation (gp_Pnt2d(h,v));
gp_Pnt2d new2d = localpos.Location();
gp_Pnt newp = axis.Location() . Translated(new2d.X() * axis.XDirection() + new2d.Y() * axis.YDirection());
cout << "arcto, newp = " << occ2ng(newp) << endl;
cout << "tangv = " << occ2ng(tangv) << endl;
cout << "tangv = (" << tangv.X() << ", " << tangv.Y() << ")" << endl;
gp_Pnt pfromsurf;
surf->D0(new2d.X(), new2d.Y(), pfromsurf);
cout << "p from plane = " << occ2ng(pfromsurf) << endl;
//cout << "p from plane = " << occ2ng(pfromsurf) << endl;
//TODO: use GCE2d_MakeArcOfCircle
Handle(Geom_TrimmedCurve) curve = GC_MakeArcOfCircle(oldp, tangv, newp);
Handle(Geom2d_TrimmedCurve) curve2d = GCE2d_MakeArcOfCircle(old2d, tangv, new2d).Value();
auto edge = BRepBuilderAPI_MakeEdge(curve).Edge();
auto edge = BRepBuilderAPI_MakeEdge(curve2d, surf).Edge();
BRepLib::BuildCurves3d(edge);
wire_builder.Add(edge);
Rotate(newAngle);
@ -188,8 +189,7 @@ public:
auto Arc(double radius, double angle)
{
double newAngle = fmod(angle,360)<180?fmod(angle,360):(-360+fmod(angle,360));
newAngle = newAngle*M_PI/180;
double newAngle = fmod(angle,360)*M_PI/180;
gp_Dir2d dir = localpos.Direction();
gp_Dir2d dirn;
@ -207,11 +207,9 @@ public:
oldp.Translate(radius*dirn);
//compute tangent vector in P1
gp_Pnt tangvEndp = axis.Location() . Translated(dir.X() * axis.XDirection() + dir.Y() * axis.YDirection());
gp_Vec tangv = gp_Vec(axis.Location(),tangvEndp);
gp_Vec2d tangv = gp_Vec2d(dir.X(),dir.Y());
//cout << "dir = " << occ2ng(dir) << endl;
cout << "tangv = " << occ2ng(tangv) << endl;
cout << "tangv = (" << tangv.X() << ", " << tangv.Y() << ")" << endl;
//add arc
return ArcTo (oldp.X(), oldp.Y(), tangv, newAngle*180/M_PI);