Base: extend Python wrapper to allow to create a quantity with Units.…

…Quantity(1, 'm') and add a unit test
FreeCAD · Jan 21, 2022 · fb84f71 · fb84f71
1 parent 2fef77e
commit fb84f71
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
@@ -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;

diff --git a/src/Mod/Test/UnitTests.py b/src/Mod/Test/UnitTests.py
@@ -147,3 +147,8 @@ def testTrigonometric(self):
         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)