From c2b7ead2ce819510fa927749469c9e34af5b4664 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 19:20:03 +0300 Subject: [PATCH] Fixed wrong units in dialog DialogEditWrongFormula. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogrotation.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogspline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index be65540c9..679e0f266 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -294,7 +294,7 @@ void DialogRotation::FXAngle() DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this); dialog->setWindowTitle(tr("Edit angle")); dialog->SetFormula(GetAngle()); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { SetAngle(dialog->GetFormula()); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 08b975a5b..301449b8b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -290,7 +290,7 @@ void DialogSpline::FXAngle1() QString angle1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText(), qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle1F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); @@ -313,7 +313,7 @@ void DialogSpline::FXAngle2() QString angle2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText(), qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle2F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 41bd2644e..cd07b4db9 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -462,7 +462,7 @@ void DialogSplinePath::FXAngle1() qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle1F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); @@ -487,7 +487,7 @@ void DialogSplinePath::FXAngle2() qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle2F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());