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

Expressions: Fixed parsing of unit expressions similar to 1/unit.

Browse Source
This commit is contained in:
Eivind Kvedalen
2016-03-28 00:38:35 +02:00
committed by wmayer
parent 8f511322bc
commit 97aa0a1c6d
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/Expression.cpp
View File

@@ -1833,6 +1833,20 @@ UnitExpression * ExpressionParser::parseUnit(const App::DocumentObject *owner, c
// Simplify expression
Expression * simplified = ScanResult->simplify();
if (!unitExpression) {
OperatorExpression * fraction = freecad_dynamic_cast<OperatorExpression>(ScanResult);
if (fraction && fraction->getOperator() == OperatorExpression::DIV) {
NumberExpression * nom = freecad_dynamic_cast<NumberExpression>(fraction->getLeft());
UnitExpression * denom = freecad_dynamic_cast<UnitExpression>(fraction->getRight());
const double epsilon = std::numeric_limits<double>::epsilon();
// If not initially a unit expression, but value is equal to 1, it means the expression is something like 1/unit
if (denom && nom && essentiallyEqual(nom->getValue(), 1.0, epsilon))
unitExpression = true;
}
}
delete ScanResult;
if (unitExpression) {