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

pyb11 fixes

Browse Source
This commit is contained in:
Christopher Lackner 2016-11-06 18:25:38 +01:00
parent 2122a954aa
commit 9e14f2ceb8
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/csg/python_csg.cpp
View File

@ -254,7 +254,7 @@ DLL_HEADER void ExportCSG(py::module &m)
})) }))
; ;
bp::class_<SplineGeometry<3>,shared_ptr<SplineGeometry<3>>> ("SplineCurve3d") py::class_<SplineGeometry<3>,shared_ptr<SplineGeometry<3>>> (m,"SplineCurve3d")
.def ("AddPoint", FunctionPointer .def ("AddPoint", FunctionPointer
([] (SplineGeometry<3> & self, double x, double y, double z) ([] (SplineGeometry<3> & self, double x, double y, double z)
{ {
@ -273,16 +273,15 @@ DLL_HEADER void ExportCSG(py::module &m)
})) }))
; ;
bp::class_<SplineSurface, shared_ptr<SplineSurface>,boost::noncopyable> ("SplineSurface", py::class_<SplineSurface, shared_ptr<SplineSurface>> (m, "SplineSurface",
"A surface for co dim 2 integrals on the splines", bp::no_init) "A surface for co dim 2 integrals on the splines")
.def("__init__", bp::make_constructor (FunctionPointer .def("__init__", FunctionPointer ([](const shared_ptr<SPSolid> base, py::list cuts)
([](const shared_ptr<SPSolid> base, bp::list cuts)
{ {
auto primitive = dynamic_cast<OneSurfacePrimitive*> (base->GetSolid()->GetPrimitive()); auto primitive = dynamic_cast<OneSurfacePrimitive*> (base->GetSolid()->GetPrimitive());
auto acuts = new Array<OneSurfacePrimitive*>(); auto acuts = new Array<OneSurfacePrimitive*>();
for(int i = 0; i<bp::len(cuts);i++) for(int i = 0; i<py::len(cuts);i++)
{ {
bp::extract<shared_ptr<SPSolid>> sps(cuts[i]); py::extract<shared_ptr<SPSolid>> sps(cuts[i]);
if(!sps.check()) if(!sps.check())
throw NgException("Cut must be SurfacePrimitive in constructor of SplineSurface!"); throw NgException("Cut must be SurfacePrimitive in constructor of SplineSurface!");
auto sp = dynamic_cast<OneSurfacePrimitive*>(sps()->GetSolid()->GetPrimitive()); auto sp = dynamic_cast<OneSurfacePrimitive*>(sps()->GetSolid()->GetPrimitive());
@ -294,21 +293,21 @@ DLL_HEADER void ExportCSG(py::module &m)
if(!primitive) if(!primitive)
throw NgException("Base is not a SurfacePrimitive in constructor of SplineSurface!"); throw NgException("Base is not a SurfacePrimitive in constructor of SplineSurface!");
return make_shared<SplineSurface>(primitive,acuts); return make_shared<SplineSurface>(primitive,acuts);
}),bp::default_call_policies(),(bp::arg("base"), bp::arg("cuts")=bp::list()))) }),(py::arg("base"), py::arg("cuts")=py::list()))
.def("AddPoint", FunctionPointer .def("AddPoint", FunctionPointer
([] (SplineSurface & self, double x, double y, double z, bool hpref) ([] (SplineSurface & self, double x, double y, double z, bool hpref)
{ {
self.AppendPoint(Point<3>(x,y,z),hpref); self.AppendPoint(Point<3>(x,y,z),hpref);
return self.GetNP()-1; return self.GetNP()-1;
}), }),
(bp::arg("self"),bp::arg("x"),bp::arg("y"),bp::arg("z"),bp::arg("hpref")=false)) py::arg("x"),py::arg("y"),py::arg("z"),py::arg("hpref")=false)
.def("AddSegment", FunctionPointer .def("AddSegment", FunctionPointer
([] (SplineSurface & self, int i1, int i2, string bcname, double maxh) ([] (SplineSurface & self, int i1, int i2, string bcname, double maxh)
{ {
auto str = new string(bcname); auto str = new string(bcname);
self.AppendSegment(new LineSeg<3>(self.GetPoint(i1),self.GetPoint(i2)),str,maxh); self.AppendSegment(new LineSeg<3>(self.GetPoint(i1),self.GetPoint(i2)),str,maxh);
}), }),
(bp::arg("self"),bp::arg("pnt1"),bp::arg("pnt2"),bp::arg("bcname")="default", bp::arg("maxh")=-1.)) py::arg("pnt1"),py::arg("pnt2"),py::arg("bcname")="default", py::arg("maxh")=-1.)
; ;
py::class_<SPSolid, shared_ptr<SPSolid>> (m, "Solid") py::class_<SPSolid, shared_ptr<SPSolid>> (m, "Solid")
@ -496,7 +495,7 @@ DLL_HEADER void ExportCSG(py::module &m)
for(auto p : surf->GetPoints()) for(auto p : surf->GetPoints())
self.AddUserPoint(p); self.AddUserPoint(p);
}), }),
(bp::arg("self"), bp::arg("SplineSurface"))) py::arg("SplineSurface"))
.def("CloseSurfaces", FunctionPointer .def("CloseSurfaces", FunctionPointer
([] (CSGeometry & self, shared_ptr<SPSolid> s1, shared_ptr<SPSolid> s2, py::list aslices ) ([] (CSGeometry & self, shared_ptr<SPSolid> s1, shared_ptr<SPSolid> s2, py::list aslices )