Part: use of factory method of Vector2dPy

This commit is contained in:
wmayer
2021-11-14 18:19:34 +01:00
parent 53db547270
commit 69fd6d35ec
10 changed files with 39 additions and 296 deletions

View File

@@ -57,13 +57,7 @@ int Conic2dPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/)
Py::Object Conic2dPy::getLocation(void) const
{
Base::Vector2d loc = getGeom2dConicPtr()->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 Conic2dPy::setLocation(Py::Object arg)
@@ -82,12 +76,7 @@ Py::Object Conic2dPy::getXAxis(void) const
{
Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle());
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 Conic2dPy::setXAxis(Py::Object arg)
@@ -103,12 +92,7 @@ Py::Object Conic2dPy::getYAxis(void) const
{
Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle());
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 Conic2dPy::setYAxis(Py::Object arg)