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

Base: harmonize Python API of Rotation class

Browse Source
This commit is contained in:
wmayer
2021-10-27 10:40:35 +02:00
parent 6d6559e99c
commit e424faa131
2 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Base/RotationPy.xml
View File

@@ -83,30 +83,36 @@
</UserDocu>
</Documentation>
</Methode>
<Methode Name="fromEuler">
<Methode Name="setYawPitchRoll">
<Documentation>
<UserDocu>
fromEuler(angle1, angle2, angle3)
setYawPitchRoll(angle1, angle2, angle3)
Set the Euler angles of this rotation
as yaw-pitch-roll in XY'Z'' convention.
or:
fromEuler(seq, angle1, angle2, angle3)
Get the Euler angles in a given sequence for this rotation.
NOTE: The angles are in degree
</UserDocu>
</Documentation>
</Methode>
<Methode Name="toEuler" Const="true">
<Methode Name="getYawPitchRoll" Const="true">
<Documentation>
<UserDocu>
toEuler() -> list
getYawPitchRoll() -> list
Get the Euler angles of this rotation
as yaw-pitch-roll in XY'Z'' convention
NOTE: The angles are in degree
</UserDocu>
</Documentation>
</Methode>
<Methode Name="setEulerAngles">
<Documentation>
<UserDocu>
setEulerAngles(seq, angle1, angle2, angle3)
Set the Euler angles in a given sequence for this rotation.
'seq' is the Euler sequence name. You get all possible values with toEulerAngles()
</UserDocu>
</Documentation>
</Methode>
<Methode Name="toEulerAngles" Const="true">
<Documentation>
<UserDocu>

57
src/Base/RotationPyImp.cpp
View File

@@ -279,35 +279,16 @@ PyObject* RotationPy::slerp(PyObject * args)
return new RotationPy(new Rotation(sl));
}
PyObject* RotationPy::fromEuler(PyObject * args)
PyObject* RotationPy::setYawPitchRoll(PyObject * args)
{
double A,B,C;
if (PyArg_ParseTuple(args, "ddd", &A, &B, &C)) {
this->getRotationPtr()->setYawPitchRoll(A,B,C);
Py_Return;
}
PyErr_Clear();
const char *seq;
if (PyArg_ParseTuple(args, "sddd", &seq, &A, &B, &C)) {
try {
getRotationPtr()->setEulerAngles(
Rotation::eulerSequenceFromName(seq), A, B, C);
Py_Return;
}
catch (const Base::Exception& e) {
e.setPyException();
return nullptr;
}
}
PyErr_SetString(PyExc_TypeError, "Expected arguments:\n"
"- float, float, float or\n"
"- string, float, float, float");
return nullptr;
if (!PyArg_ParseTuple(args, "ddd", &A, &B, &C))
return nullptr;
this->getRotationPtr()->setYawPitchRoll(A,B,C);
Py_Return;
}
PyObject* RotationPy::toEuler(PyObject * args)
PyObject* RotationPy::getYawPitchRoll(PyObject * args)
{
if (!PyArg_ParseTuple(args, ""))
return nullptr;
@@ -321,11 +302,29 @@ PyObject* RotationPy::toEuler(PyObject * args)
return Py::new_reference_to(tuple);
}
PyObject* RotationPy::setEulerAngles(PyObject * args)
{
const char *seq;
double A,B,C;
if (!PyArg_ParseTuple(args, "sddd", &seq, &A, &B, &C))
return nullptr;
try {
getRotationPtr()->setEulerAngles(
Rotation::eulerSequenceFromName(seq), A, B, C);
Py_Return;
}
catch (const Base::Exception& e) {
e.setPyException();
return nullptr;
}
}
PyObject* RotationPy::toEulerAngles(PyObject * args)
{
const char *seq = nullptr;
if (!PyArg_ParseTuple(args, "|s", &seq))
return NULL;
return nullptr;
if (!seq) {
Py::List res;
for (int i=1; i<Rotation::EulerSequenceLast; ++i)
@@ -465,7 +464,11 @@ PyObject *RotationPy::getCustomAttributes(const char* attr) const
this->getRotationPtr()->getYawPitchRoll(A,B,C);
return PyFloat_FromDouble(C);
}
return 0;
else if (strcmp(attr, "toEuler") == 0) {
Py::Object self(const_cast<RotationPy*>(this), false);
return Py::new_reference_to(self.getAttr("getYawPitchRoll"));
}
return nullptr;
}
int RotationPy::setCustomAttributes(const char* attr, PyObject* obj)