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

Expressions: Fixed issue #3128; mod(x;y) should support arbitrary units for both arguments.

Browse Source
This commit is contained in:
Eivind Kvedalen
2017-07-13 12:14:40 +02:00
parent b17ff7b493
commit 3a33273fce
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/Expression.cpp
View File

@@ -1007,9 +1007,7 @@ Expression * FunctionExpression::eval() const
case MOD:
if (v2 == 0)
throw ExpressionError("Invalid second argument.");
if (!v2->getUnit().isEmpty())
throw ExpressionError("Second argument must have empty unit.");
unit = v1->getUnit();
unit = v1->getUnit() / v2->getUnit();
break;
case POW: {
if (v2 == 0)

11
src/Mod/Spreadsheet/TestSpreadsheet.py
View File

@@ -300,7 +300,7 @@ class SpreadsheetCases(unittest.TestCase):
self.assertMostlyEqual(sheet.A19, 3) # Mod
self.assertMostlyEqual(sheet.B19, -3)
self.assertMostlyEqual(sheet.C19, Units.Quantity('3 mm'))
self.assertEqual(sheet.D19, u'ERR: Second argument must have empty unit.')
self.assertEqual(sheet.D19, 3)
self.assertMostlyEqual(sheet.A20, Units.Quantity('45 deg')) # Atan2
self.assertMostlyEqual(sheet.B20, Units.Quantity('-45 deg'))
self.assertEqual(sheet.C20, u'ERR: Units must be equal')
@@ -775,6 +775,15 @@ class SpreadsheetCases(unittest.TestCase):
# Close second document
FreeCAD.closeDocument(doc2.Name)
def testIssue3128(self):
""" Regression test for issue 3128; mod should work with arbitrary units for both arguments """
sheet = self.doc.addObject('Spreadsheet::Sheet','Spreadsheet')
sheet.set('A1', '=mod(7mm;3mm)')
sheet.set('A2', '=mod(7kg;3mm)')
self.doc.recompute()
self.assertEqual(sheet.A1, Units.Quantity('1'))
self.assertEqual(sheet.A2, Units.Quantity('1 kg/mm'))
def tearDown(self):
#closing doc
FreeCAD.closeDocument(self.doc.Name)