kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Path: libarea: update to latest pybind11

Browse Source
This commit is contained in:
looooo
2017-09-07 18:41:01 +02:00
parent 0e18c6e061
commit 6de23532c8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Path/libarea/pyarea.cpp
View File

@@ -189,7 +189,7 @@ std::list<Point> spanIntersect(const Span& span1, const Span& span2) {
}
void MatrixFromVector(geoff_geometry::Matrix& instance, std::vector<double> v){
geoff_geometry::Matrix* MatrixFromVector(std::vector<double> v){
double array[16];
int i = 0;
for (double vi: v){
@@ -197,7 +197,7 @@ void MatrixFromVector(geoff_geometry::Matrix& instance, std::vector<double> v){
i++;
if(i>=16) break;
}
new (&instance) geoff_geometry::Matrix(array);
return new geoff_geometry::Matrix(array);
}
std::list<CCurve> InsideCurves(const CArea& a, const CCurve& curve) {
@@ -279,7 +279,7 @@ void init_pyarea(py::module &m){
;
py::class_<CCurve>(m, "Curve")
.def(py::init<CCurve>())
.def(py::init<>())
.def("getVertices", &getVertices)
.def("append",&CCurve::append)
.def("append",&append_point)
@@ -318,7 +318,7 @@ void init_pyarea(py::module &m){
;
py::class_<CArea>(m, "Area")
.def(py::init<CArea>())
.def(py::init<>())
.def("getCurves", &getCurves)
.def("append",&CArea::append)
.def("Subtract",&CArea::Subtract)
@@ -341,7 +341,7 @@ void init_pyarea(py::module &m){
py::class_<geoff_geometry::Matrix, std::shared_ptr<geoff_geometry::Matrix> > (m, "Matrix")
.def(py::init<geoff_geometry::Matrix>())
.def("__init__", &MatrixFromVector)
.def(py::init(&MatrixFromVector))
.def("TransformedPoint", &transformed_point)
.def("Multiply", &geoff_geometry::Matrix::Multiply)
;
@@ -353,8 +353,7 @@ void init_pyarea(py::module &m){
m.def("TangentialArc", TangentialArc);
}
PYBIND11_PLUGIN(area){
py::module m("area");
PYBIND11_MODULE(area, m){
m.doc()= "not yet";
init_pyarea(m);
return m.ptr();
};
};