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

small 2d workplane simplifications

Browse Source
This commit is contained in:
Joachim Schoeberl 2021-09-10 12:09:51 +02:00
parent 6a6a98dcea
commit 94ee2b67ad
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/occ/python_occ_shapes.cpp
View File

@ -1545,16 +1545,23 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
return curve->Value(curve->LastParameter()); return curve->Value(curve->LastParameter());
}) })
.def("Edge", [](Handle(Geom2d_Curve) curve) { .def("Edge", [](Handle(Geom2d_Curve) curve) {
// Geom_Plane surf{gp_Ax3()}; // static Geom_Plane surf{gp_Ax3()}; // crashes in nbconvert ???
auto surf = new Geom_Plane{gp_Ax3()}; static auto surf = new Geom_Plane{gp_Ax3()};
auto edge = BRepBuilderAPI_MakeEdge(curve, surf).Edge(); auto edge = BRepBuilderAPI_MakeEdge(curve, surf).Edge();
BRepLib::BuildCurves3d(edge); BRepLib::BuildCurves3d(edge);
return edge; return edge;
}) })
.def("Wire", [](Handle(Geom2d_Curve) curve) {
// static Geom_Plane surf{gp_Ax3()}; // crashes in nbconvert ???
static auto surf = new Geom_Plane{gp_Ax3()};
auto edge = BRepBuilderAPI_MakeEdge(curve, surf).Edge();
BRepLib::BuildCurves3d(edge);
return BRepBuilderAPI_MakeWire(edge).Wire();
})
.def("Face", [](Handle(Geom2d_Curve) curve) { .def("Face", [](Handle(Geom2d_Curve) curve) {
// static surf = new Geom_Plane{gp_Ax3()}; // static Geom_Plane surf{gp_Ax3()}; // crashes in nbconvert ???
static Geom_Plane surf{gp_Ax3()}; static auto surf = new Geom_Plane{gp_Ax3()};
auto edge = BRepBuilderAPI_MakeEdge(curve, &surf).Edge(); auto edge = BRepBuilderAPI_MakeEdge(curve, surf).Edge();
BRepLib::BuildCurves3d(edge); BRepLib::BuildCurves3d(edge);
auto wire = BRepBuilderAPI_MakeWire(edge).Wire(); auto wire = BRepBuilderAPI_MakeWire(edge).Wire();
return BRepBuilderAPI_MakeFace(wire).Face(); return BRepBuilderAPI_MakeFace(wire).Face();
@ -1878,7 +1885,8 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
.def("Reverse", &WorkPlane::Reverse, "revert orientation of current wire") .def("Reverse", &WorkPlane::Reverse, "revert orientation of current wire")
.def("Close", &WorkPlane::Close, "draw line to start point of wire, and finish wire") .def("Close", &WorkPlane::Close, "draw line to start point of wire, and finish wire")
.def("Finish", &WorkPlane::Finish, "finish current wire without closing") .def("Finish", &WorkPlane::Finish, "finish current wire without closing")
.def("Last", &WorkPlane::Last, "returns current wire") .def("Last", &WorkPlane::Last, "(deprecated) returns current wire")
.def("Wire", &WorkPlane::Last, "returns current wire")
.def("Face", &WorkPlane::Face, "generate and return face of all wires, resets list of wires") .def("Face", &WorkPlane::Face, "generate and return face of all wires, resets list of wires")
.def("Wires", &WorkPlane::Wires, "returns all wires") .def("Wires", &WorkPlane::Wires, "returns all wires")
; ;

9
python/occ.py
View File

@ -21,8 +21,7 @@ Rotation = gp_Trsf.Rotation
Mirror = gp_Trsf.Mirror Mirror = gp_Trsf.Mirror
wp2d = WorkPlane() def Rectangle(l,w): return WorkPlane().Rectangle(l,w)
def Rectangle(l,w): return wp2d.Rectangle(l,w) def MoveTo(x,y): return WorkPlane().MoveTo(x,y)
def MoveTo(x,y): return wp2d.MoveTo(x,y) def LineTo(x,y): return WorkPlane().LineTo(x,y)
def LineTo(x,y): return wp2d.LineTo(x,y) def Line(l): return WorkPlane().Line(l)
def Line(l): return wp2d.Line(l)