ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-13 06:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

[occ] Better arguments for Cylinder

Browse Source
This commit is contained in:
Christopher Lackner 2021-10-11 12:48:14 +02:00
parent 41d9fbf258
commit c9f1db548c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/occ/python_occ_shapes.cpp
View File

@ -1713,20 +1713,20 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
}, py::arg("c"), py::arg("r"), "create sphere with center 'c' and radius 'r'"); }, py::arg("c"), py::arg("r"), "create sphere with center 'c' and radius 'r'");
m.def("Cylinder", [] (gp_Pnt cpnt, gp_Dir cdir, double r, double h, m.def("Cylinder", [] (gp_Pnt cpnt, gp_Dir cdir, double r, double h,
std::string bot, std::string top, std::string mantle) { optional<string> bot, optional<string> top, optional<string> mantle) {
auto builder = BRepPrimAPI_MakeCylinder (gp_Ax2(cpnt, cdir), r, h); auto builder = BRepPrimAPI_MakeCylinder (gp_Ax2(cpnt, cdir), r, h);
if(mantle != "") if(mantle)
OCCGeometry::global_shape_properties[builder.Face().TShape()].name = mantle; OCCGeometry::global_shape_properties[builder.Face().TShape()].name = *mantle;
auto pyshape = py::cast(builder.Solid()); auto pyshape = py::cast(builder.Solid());
gp_Vec v = cdir; gp_Vec v = cdir;
if(bot != "") if(bot)
pyshape.attr("faces").attr("Min")(v).attr("name") = bot; pyshape.attr("faces").attr("Min")(v).attr("name") = *bot;
if(top != "") if(top)
pyshape.attr("faces").attr("Max")(v).attr("name") = top; pyshape.attr("faces").attr("Max")(v).attr("name") = *top;
return pyshape; return pyshape;
}, py::arg("p"), py::arg("d"), py::arg("r"), py::arg("h"), }, py::arg("p"), py::arg("d"), py::arg("r"), py::arg("h"),
py::arg("bot") = "", py::arg("top") = "", py::arg("bottom") = nullopt, py::arg("top") = nullopt,
py::arg("mantle") = "", py::arg("mantle") = nullopt,
"create cylinder with base point 'p', axis direction 'd', radius 'r', and height 'h'"); "create cylinder with base point 'p', axis direction 'd', radius 'r', and height 'h'");
m.def("Cylinder", [] (gp_Ax2 ax, double r, double h) { m.def("Cylinder", [] (gp_Ax2 ax, double r, double h) {