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

Spreadsheet: Fix for issue #2646: Spreadsheet-Sum-Function does not work with units

Browse Source 
This fix also fixes the other aggregates.
This commit is contained in:
Eivind Kvedalen
2016-11-12 08:29:46 +01:00
committed by wmayer
parent b398069372
commit d00ff2155d
2 changed files with 102 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App/Expression.cpp
View File

@@ -733,7 +733,7 @@ public:
Collector() : first(true) { }
virtual void collect(Quantity value) {
if (first)
value.setUnit(value.getUnit());
q.setUnit(value.getUnit());
}
virtual Quantity getQuantity() const {
return q;
@@ -779,7 +779,7 @@ public:
void collect(Quantity value) {
Collector::collect(value);
if (first) {
M2 = Quantity(0, value.getUnit());
M2 = Quantity(0, value.getUnit() * value.getUnit());
mean = Quantity(0, value.getUnit());
n = 0;
}
@@ -795,7 +795,7 @@ public:
if (n < 2)
throw ExpressionError("Invalid number of entries: at least two required.");
else
return (M2 / (n - 1.0)).pow(Quantity(0.5));
return Quantity((M2 / (n - 1.0)).pow(Quantity(0.5)).getValue(), mean.getUnit());
}
private: