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

Expression: move handling of invalid quantities (NaN) from FunctionExpression to DlgExpressionInput

Browse Source
This commit is contained in:
wmayer
2020-06-07 18:00:35 +02:00
parent 200c7c7e00
commit 89ddab33f6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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());