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

Base: extend Python wrapper to allow to create a quantity with Units.Quantity(1, 'm') and add a unit test

Browse Source
This commit is contained in:
wmayer
2022-01-21 14:57:49 +01:00
parent 2fef77e267
commit fb84f715fa
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Base/QuantityPyImp.cpp
View File

@@ -133,7 +133,22 @@ int QuantityPy::PyInit(PyObject* args, PyObject* /*kwd*/)
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return-1;
return -1;
}
return 0;
}
PyErr_Clear(); // set by PyArg_ParseTuple()
if (PyArg_ParseTuple(args,"det", &f, "utf-8", &string)) {
QString unit = QString::fromUtf8(string);
PyMem_Free(string);
try {
*self = Quantity(f, unit);
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return -1;
}
return 0;

5
src/Mod/Test/UnitTests.py
View File

@@ -147,3 +147,8 @@ class UnitBasicCases(unittest.TestCase):
self.failUnless(compare(tu('sin(pi)'), math.sin(math.pi)))
self.failUnless(compare(tu('cos(pi)'), math.cos(math.pi)))
self.failUnless(compare(tu('tan(pi)'), math.tan(math.pi)))
def testQuantity(self):
length = FreeCAD.Units.Quantity(1, "m")
self.assertEqual(length.Value, 1000)
self.assertEqual(length.Unit, FreeCAD.Units.Length)