Merge branch 'shape_name_return_optional' into 'master'

shape.name return optional<string>

See merge request jschoeberl/netgen!469
This commit is contained in:
Joachim Schöberl 2022-01-20 16:48:43 +00:00
commit 86fd2983c7

View File

@ -719,11 +719,11 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
return shape; return shape;
}, py::arg("name"), "sets 'name' property to all solids of shape") }, py::arg("name"), "sets 'name' property to all solids of shape")
.def_property("name", [](const TopoDS_Shape & self) { .def_property("name", [](const TopoDS_Shape & self) -> optional<string> {
if (auto name = OCCGeometry::global_shape_properties[self.TShape()].name) if (auto name = OCCGeometry::global_shape_properties[self.TShape()].name)
return *name; return *name;
else else
return string(); return nullopt;
}, [](const TopoDS_Shape & self, optional<string> name) { }, [](const TopoDS_Shape & self, optional<string> name) {
OCCGeometry::global_shape_properties[self.TShape()].name = name; OCCGeometry::global_shape_properties[self.TShape()].name = name;
}, "'name' of shape") }, "'name' of shape")