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

Merge branch 'master' into prefDirs

Browse Source
This commit is contained in:
WandererFan
2020-06-07 13:33:56 -04:00
committed by GitHub
parent 1eb87229af 8a10b77400
commit dfcfce701c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/App/Expression.cpp
View File

@@ -2301,12 +2301,7 @@ Py::Object FunctionExpression::evaluate(const Expression *expr, int f, const std
_EXPR_THROW("Unknown function: " << f,expr);
}
Quantity q(scaler * output, unit);
if (!q.isValid()) {
throw Base::ValueError("Not a number");
}
return Py::asObject(new QuantityPy(new Quantity(q)));
return Py::asObject(new QuantityPy(new Quantity(scaler * output, unit)));
}
Py::Object FunctionExpression::_getPyValue() const {

8
src/Gui/DlgExpressionInput.cpp
View File

@@ -156,13 +156,17 @@ void DlgExpressionInput::textChanged(const QString &text)
Base::Quantity value = n->getQuantity();
QString msg = value.getUserString();
if(!impliedUnit.isEmpty()) {
if (!value.isValid()) {
throw Base::ValueError("Not a number");
}
else if (!impliedUnit.isEmpty()) {
if (!value.getUnit().isEmpty() && value.getUnit() != impliedUnit)
throw Base::UnitsMismatchError("Unit mismatch between result and required unit");
value.setUnit(impliedUnit);
} else if (!value.getUnit().isEmpty()) {
}
else if (!value.getUnit().isEmpty()) {
msg += QString::fromUtf8(" (Warning: unit discarded)");
QPalette p(ui->msg->palette());