Part: use of factory method of Vector2dPy

This commit is contained in:
wmayer
2021-11-14 18:19:34 +01:00
parent 50523fe951
commit 0c933ac70a
10 changed files with 39 additions and 296 deletions

View File

@@ -59,13 +59,7 @@ int ArcOfConic2dPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/)
Py::Object ArcOfConic2dPy::getLocation(void) const
{
Base::Vector2d loc = getGeom2dArcOfConicPtr()->getLocation();
Py::Module module("__FreeCADBase__");
Py::Callable method(module.getAttr("Vector2d"));
Py::Tuple arg(2);
arg.setItem(0, Py::Float(loc.x));
arg.setItem(1, Py::Float(loc.y));
return method.apply(arg);
return Base::Vector2dPy::create(loc);
}
void ArcOfConic2dPy::setLocation(Py::Object arg)
@@ -86,12 +80,7 @@ Py::Object ArcOfConic2dPy::getXAxis(void) const
Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle());
Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve());
gp_Dir2d xdir = conic->XAxis().Direction();
Py::Module module("__FreeCADBase__");
Py::Callable method(module.getAttr("Vector2d"));
Py::Tuple arg(2);
arg.setItem(0, Py::Float(xdir.X()));
arg.setItem(1, Py::Float(xdir.Y()));
return method.apply(arg);
return Base::Vector2dPy::create(xdir.X(), xdir.Y());
}
void ArcOfConic2dPy::setXAxis(Py::Object arg)
@@ -109,12 +98,7 @@ Py::Object ArcOfConic2dPy::getYAxis(void) const
Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle());
Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve());
gp_Dir2d ydir = conic->YAxis().Direction();
Py::Module module("__FreeCADBase__");
Py::Callable method(module.getAttr("Vector2d"));
Py::Tuple arg(2);
arg.setItem(0, Py::Float(ydir.X()));
arg.setItem(1, Py::Float(ydir.Y()));
return method.apply(arg);
return Base::Vector2dPy::create(ydir.X(), ydir.Y());
}
void ArcOfConic2dPy::setYAxis(Py::Object arg)