diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 2d09c188f..7a09bdb0e 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -191,44 +191,48 @@ void DialogEditWrongFormula::ValChanged(int row) if (ui->radioButtonStandardTable->isChecked()) { const QSharedPointer stable = data->GetVariable(name); - SetDescription(item->text(), *stable->GetValue(), UnitsToStr(qApp->patternUnits(), true), - stable->GetGuiText()); + SetDescription(item->text(), *stable->GetValue(), stable->IsSpecialUnits(), stable->GetGuiText()); } else if (ui->radioButtonIncrements->isChecked()) { const QSharedPointer incr = data->GetVariable(name); - SetDescription(item->text(), *incr->GetValue(), UnitsToStr(qApp->patternUnits(), true), - incr->GetDescription()); + const bool specialUnits = false; + SetDescription(item->text(), *incr->GetValue(), specialUnits, incr->GetDescription()); } else if (ui->radioButtonPC->isChecked()) { const QSharedPointer incr = data->GetVariable(name); - SetDescription(item->text(), *incr->GetValue(), UnitsToStr(qApp->patternUnits(), true), - incr->GetDescription()); + const bool specialUnits = false; + SetDescription(item->text(), *incr->GetValue(), specialUnits, incr->GetDescription()); } else if (ui->radioButtonLengthLine->isChecked()) { - SetDescription(item->text(), *data->GetVariable(name)->GetValue(), - UnitsToStr(qApp->patternUnits(), true), tr("Line length")); + const bool specialUnits = false; + SetDescription(item->text(), *data->GetVariable(name)->GetValue(), specialUnits, + tr("Line length")); } else if (ui->radioButtonLengthSpline->isChecked()) { - SetDescription(item->text(), *data->GetVariable(name)->GetValue(), - UnitsToStr(qApp->patternUnits(), true), tr("Curve length")); + const bool specialUnits = false; + SetDescription(item->text(), *data->GetVariable(name)->GetValue(), specialUnits, + tr("Curve length")); } else if (ui->radioButtonAngleLine->isChecked()) { - SetDescription(item->text(), *data->GetVariable(name)->GetValue(), degreeSymbol, + const bool specialUnits = true; + SetDescription(item->text(), *data->GetVariable(name)->GetValue(), specialUnits, tr("Line Angle")); } else if (ui->radioButtonRadiusesArcs->isChecked()) { - SetDescription(item->text(), *data->GetVariable(name)->GetValue(), - UnitsToStr(qApp->patternUnits(), true), tr("Arc radius")); + const bool specialUnits = false; + SetDescription(item->text(), *data->GetVariable(name)->GetValue(), specialUnits, + tr("Arc radius")); } else if (ui->radioButtonAnglesCurves->isChecked()) { - SetDescription(item->text(), *data->GetVariable(name)->GetValue(), degreeSymbol, + const bool specialUnits = true; + SetDescription(item->text(), *data->GetVariable(name)->GetValue(), specialUnits, tr("Curve angle")); } else if (ui->radioButtonFunctions->isChecked()) @@ -503,10 +507,11 @@ void DialogEditWrongFormula::InitVariables() } //--------------------------------------------------------------------------------------------------------------------- -void DialogEditWrongFormula::SetDescription(const QString &name, qreal value, const QString &unit, +void DialogEditWrongFormula::SetDescription(const QString &name, qreal value, bool specialUnits, const QString &description) { - const QString desc = QStringLiteral("%1(%2 %3) - %4").arg(name).arg(value).arg(unit, description); + const QString unit = specialUnits ? degreeSymbol : " " + UnitsToStr(qApp->patternUnits(), true); + const QString desc = QStringLiteral("%1(%2%3) - %4").arg(name).arg(value).arg(unit, description); ui->labelDescription->setText(desc); } diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index c228163f1..677802c1e 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -121,7 +121,7 @@ private: void ShowFunctions(); void ShowIncrementsInPreviewCalculation(bool show); - void SetDescription(const QString &name, qreal value, const QString &unit, const QString &description); + void SetDescription(const QString &name, qreal value, bool specialUnits, const QString &description); }; //---------------------------------------------------------------------------------------------------------------------