Skip to content

Improve unit spinbox #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve unit spinbox #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/customwidgets/mydoublespinboxwithunits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,18 @@ QString MyDoubleSpinBoxWithUnits::textFromValue(double val) const {
return (QString::number(val, 'g', 3) + " ");
}

return (floatToNiceString(val, 4, false, false, trimDecimalZeroes));
UnitOfMeasure unit = useUnitPrefix ? UnitOfMeasure("-") : UnitOfMeasure("");
return (floatToNiceString(val, 4, false, false, trimDecimalZeroes, unit));
}

double MyDoubleSpinBoxWithUnits::valueFromText(const QString &text) const {
QString expr = text;
SimpleExpressionParser parser;
if (!suffix().isEmpty())
expr = expr.left(expr.lastIndexOf(suffix()));
expr = expr.trimmed();
if (expr.isEmpty())
return emptyDefaultValue;
bool isOK;
double newValue = parser.evaluate(expr, &isOK);
if (isOK)
Expand Down Expand Up @@ -89,7 +93,8 @@ void MyDoubleSpinBoxWithUnits::stepBy(int steps) {

void MyDoubleSpinBoxWithUnits::setUnit(UnitOfMeasure unit) {
QDoubleSpinBox::setSuffix(unit.text);
this->useUnitPrefix = unit.mode == UnitOfMeasure::time || UnitOfMeasure::usePrefix;
this->useUnitPrefix =
(unit.mode == UnitOfMeasure::time || unit.mode == UnitOfMeasure::usePrefix);
}

void MyDoubleSpinBoxWithUnits::showEvent(QShowEvent *event) {
Expand Down
1 change: 0 additions & 1 deletion src/customwidgets/mydoublespinboxwithunits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ class MyDoubleSpinBoxWithUnits : public QDoubleSpinBox {
QString textFromValue(double val) const;
double valueFromText(const QString &text) const;
bool useUnitPrefix = true;
QString replaceUnitPrefixes(QString expr) const;

signals:
};
Expand Down