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

Merge pull request #21147 from 3x380V/units

Browse Source 
Units rework II
This commit is contained in:
Benjamin Nauck
2025-06-04 15:58:00 +02:00
committed by GitHub
parent d1e9c7b013 2e0df80e84
commit 92bf6e5f2a
26 changed files with 1103 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/Dialogs/DlgExpressionInput.cpp
View File

@@ -298,14 +298,14 @@ void DlgExpressionInput::checkExpression(const QString& text)
}
auto msg = value.getUserString();
if (!impliedUnit.isEmpty()) {
if (!value.getUnit().isEmpty() && value.getUnit() != impliedUnit)
if (impliedUnit != Base::Unit::One) {
if (!value.isDimensionless() && value.getUnit() != impliedUnit)
throw Base::UnitsMismatchError("Unit mismatch between result and required unit");
value.setUnit(impliedUnit);
}
else if (!value.getUnit().isEmpty()) {
else if (!value.isDimensionless()) {
msg += " (Warning: unit discarded)";
QPalette p(ui->msg->palette());