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

Expressions: Fixed issue #3432; aggregate functions sometimes ignore some of their arguments.

Browse Source 
Also updated regression tests in Spreadsheet module.
This commit is contained in:
Eivind Kvedalen
2018-04-20 19:49:13 +02:00
committed by wmayer
parent b440dc830b
commit ae7bef9978
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/Expression.cpp
View File

@@ -897,16 +897,13 @@ Expression * FunctionExpression::evalAggregate() const
throw Exception("Invalid property type for aggregate");
} while (range.next());
}
else if (args[i]->isDerivedFrom(App::VariableExpression::getClassTypeId())) {
else {
std::unique_ptr<Expression> e(args[i]->eval());
NumberExpression * n(freecad_dynamic_cast<NumberExpression>(e.get()));
if (n)
c->collect(n->getQuantity());
}
else if (args[i]->isDerivedFrom(App::NumberExpression::getClassTypeId())) {
c->collect(static_cast<NumberExpression*>(args[i])->getQuantity());
}
}
return new NumberExpression(owner, c->getQuantity());

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

@@ -851,6 +851,16 @@ class SpreadsheetCases(unittest.TestCase):
self.assertEqual(sheet.getContents('B1'), '=A1 == 1 ? 11 : (A1 == 2 ? 12 : 13)')
self.assertEqual(sheet.getContents('C1'), '=A1 == 1 ? (A1 == 2 ? 12 : 13) : 11')
def testIssue3432(self):
""" Regression test for issue 3432; numbers with units are ignored from aggregates"""
sheet = self.doc.addObject('Spreadsheet::Sheet','Spreadsheet')
sheet.set('A1', '1mm')
sheet.set('B1', '2mm')
sheet.set('C1', '=max(A1:B1;3mm)')
self.doc.recompute()
self.assertEqual(sheet.get('C1'), Units.Quantity('3 mm'))
def tearDown(self):
#closing doc
FreeCAD.closeDocument(self.doc.Name)