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

fixes #0002419: Matrix rotation and Units compatibility

Browse Source
This commit is contained in:
wmayer
2017-10-25 13:50:06 +02:00
parent 0ad9436eab
commit 25fb77a5a0
1 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/Base/MatrixPyImp.cpp
View File

@@ -30,6 +30,7 @@
// inclusion of the generated files (generated out of MatrixPy.xml)
#include "VectorPy.h"
#include "GeometryPyCXX.h"
#include "QuantityPy.h"
#include "MatrixPy.h"
#include "MatrixPy.cpp"
@@ -277,12 +278,29 @@ PyObject* MatrixPy::transform(PyObject * args)
PyObject* MatrixPy::rotateX(PyObject * args)
{
double a;
if (!PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &a)) // convert args: Python->C
return NULL; // NULL triggers exception
double angle = 0;
do {
PyObject *object;
if (PyArg_ParseTuple(args,"O!",&(Base::QuantityPy::Type), &object)) {
Quantity *q = static_cast<Base::QuantityPy*>(object)->getQuantityPtr();
if (q->getUnit() == Base::Unit::Angle) {
angle = q->getValueAs(Base::Quantity::Radian);
break;
}
}
PyErr_Clear();
if (PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &angle)) {
break;
}
PyErr_SetString(PyExc_TypeError, "For angle either float or Quantity expected");
return 0;
}
while (false);
PY_TRY {
getMatrixPtr()->rotX(a);
getMatrixPtr()->rotX(angle);
}
PY_CATCH;
@@ -291,12 +309,29 @@ PyObject* MatrixPy::rotateX(PyObject * args)
PyObject* MatrixPy::rotateY(PyObject * args)
{
double a;
if (!PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &a)) // convert args: Python->C
return NULL; // NULL triggers exception
double angle = 0;
do {
PyObject *object;
if (PyArg_ParseTuple(args,"O!",&(Base::QuantityPy::Type), &object)) {
Quantity *q = static_cast<Base::QuantityPy*>(object)->getQuantityPtr();
if (q->getUnit() == Base::Unit::Angle) {
angle = q->getValueAs(Base::Quantity::Radian);
break;
}
}
PyErr_Clear();
if (PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &angle)) {
break;
}
PyErr_SetString(PyExc_TypeError, "For angle either float or Quantity expected");
return 0;
}
while (false);
PY_TRY {
getMatrixPtr()->rotY(a);
getMatrixPtr()->rotY(angle);
}
PY_CATCH;
@@ -305,12 +340,29 @@ PyObject* MatrixPy::rotateY(PyObject * args)
PyObject* MatrixPy::rotateZ(PyObject * args)
{
double a;
if (!PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &a)) // convert args: Python->C
return NULL; // NULL triggers exception
double angle = 0;
do {
PyObject *object;
if (PyArg_ParseTuple(args,"O!",&(Base::QuantityPy::Type), &object)) {
Quantity *q = static_cast<Base::QuantityPy*>(object)->getQuantityPtr();
if (q->getUnit() == Base::Unit::Angle) {
angle = q->getValueAs(Base::Quantity::Radian);
break;
}
}
PyErr_Clear();
if (PyArg_ParseTuple(args, "d: angle to rotate (double) needed", &angle)) {
break;
}
PyErr_SetString(PyExc_TypeError, "For angle either float or Quantity expected");
return 0;
}
while (false);
PY_TRY {
getMatrixPtr()->rotZ(a);
getMatrixPtr()->rotZ(angle);
}
PY_CATCH;