From abbf5444953682dfbdb5acf75ed7ef724d2d00b3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 27 Sep 2023 12:50:33 +0200 Subject: [PATCH] Base: use NoArgs in MatrixPy --- src/Base/MatrixPy.xml | 22 ++++++++-------- src/Base/MatrixPyImp.cpp | 55 ++++++++-------------------------------- 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/src/Base/MatrixPy.xml b/src/Base/MatrixPy.xml index f59db854ae..4f06bf99fa 100644 --- a/src/Base/MatrixPy.xml +++ b/src/Base/MatrixPy.xml @@ -97,28 +97,28 @@ if it's not a scale matrix. tol : float - + nullify() -> None Make this the null matrix. - + isNull() -> bool Check if this is the null matrix. - + unity() -> None Make this matrix to unity (4D identity matrix). - + isUnity() -> bool @@ -185,7 +185,7 @@ index : int vector : Base.Vector - + diagonal() -> Base.Vector @@ -252,34 +252,34 @@ Compute the transformed vector using the matrix. vector : Base.Vector - + invert() -> None Compute the inverse matrix in-place, if possible. - + inverse() -> Base.Matrix Compute the inverse matrix, if possible. - + transpose() -> None Transpose the matrix in-place. - + transposed() -> Base.Matrix Returns a transposed copy of this matrix. - + determinant() -> float @@ -309,7 +309,7 @@ dim : int Dimension parameter must be in the range [1,4]. - + analyze() -> str diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp index 9cf794d37a..505b77ab3e 100644 --- a/src/Base/MatrixPyImp.cpp +++ b/src/Base/MatrixPyImp.cpp @@ -352,11 +352,8 @@ PyObject* MatrixPy::hasScale(PyObject * args) return Py::new_reference_to(mod.callMemberFunction("ScaleType", Py::TupleN(Py::Int(static_cast(type))))); } -PyObject* MatrixPy::nullify(PyObject * args) +PyObject* MatrixPy::nullify() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { getMatrixPtr()->nullify(); Py_Return; @@ -364,11 +361,8 @@ PyObject* MatrixPy::nullify(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::isNull(PyObject * args) +PyObject* MatrixPy::isNull() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { bool ok = getMatrixPtr()->isNull(); return Py::new_reference_to(Py::Boolean(ok)); @@ -376,11 +370,8 @@ PyObject* MatrixPy::isNull(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::unity(PyObject * args) +PyObject* MatrixPy::unity() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { getMatrixPtr()->setToUnity(); Py_Return; @@ -388,11 +379,8 @@ PyObject* MatrixPy::unity(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::isUnity(PyObject * args) +PyObject* MatrixPy::isUnity() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { bool ok = getMatrixPtr()->isUnity(); return Py::new_reference_to(Py::Boolean(ok)); @@ -487,11 +475,8 @@ PyObject* MatrixPy::setRow(PyObject * args) Py_Return; } -PyObject* MatrixPy::diagonal(PyObject * args) +PyObject* MatrixPy::diagonal() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - Matrix4D* mat = getMatrixPtr(); Base::Vector3d v = mat->diagonal(); return Py::new_reference_to(Py::Vector(v)); @@ -628,11 +613,8 @@ PyObject* MatrixPy::multVec(PyObject * args) return new VectorPy(new Vector3d(vec)); } -PyObject* MatrixPy::invert(PyObject * args) +PyObject* MatrixPy::invert() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { if (fabs(getMatrixPtr()->determinant()) > DBL_EPSILON) { getMatrixPtr()->inverseGauss(); @@ -646,11 +628,8 @@ PyObject* MatrixPy::invert(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::inverse(PyObject * args) +PyObject* MatrixPy::inverse() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { if (fabs(getMatrixPtr()->determinant()) > DBL_EPSILON) { Base::Matrix4D m = *getMatrixPtr(); @@ -665,11 +644,8 @@ PyObject* MatrixPy::inverse(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::determinant(PyObject * args) +PyObject* MatrixPy::determinant() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - return PyFloat_FromDouble(getMatrixPtr()->determinant()); } @@ -741,11 +717,8 @@ PyObject* MatrixPy::isOrthogonal(PyObject * args) return Py::new_reference_to(Py::Float(ok ? mult : 0.0)); } -PyObject* MatrixPy::transposed(PyObject * args) +PyObject* MatrixPy::transposed() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { Base::Matrix4D m = *getMatrixPtr(); m.transpose(); @@ -754,11 +727,8 @@ PyObject* MatrixPy::transposed(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::transpose(PyObject * args) +PyObject* MatrixPy::transpose() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { getMatrixPtr()->transpose(); Py_Return; @@ -766,11 +736,8 @@ PyObject* MatrixPy::transpose(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::analyze(PyObject * args) +PyObject* MatrixPy::analyze() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { std::string type = getMatrixPtr()->analyse(); return PyUnicode_FromString(type.c_str());