From cfc2b187f6366672204f99811f613a6e562ed9cc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 10 Feb 2015 15:17:18 +0200 Subject: [PATCH] Dialogs don't return correct formulas. --HG-- branch : feature --- src/app/dialogs/tools/dialogarc.cpp | 8 ++++---- src/app/dialogs/tools/dialogpointofcontact.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 726a05d27..778f64c9e 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -191,7 +191,7 @@ void DialogArc::SetF1(const QString &value) */ void DialogArc::SetRadius(const QString &value) { - radius = value; + radius = qApp->FormulaToUser(value); // increase height if needed. if (radius.length() > 80) { @@ -443,7 +443,7 @@ quint32 DialogArc::GetCenter() const */ QString DialogArc::GetRadius() const { - return radius; + return qApp->FormulaFromUser(radius); } //--------------------------------------------------------------------------------------------------------------------- @@ -453,7 +453,7 @@ QString DialogArc::GetRadius() const */ QString DialogArc::GetF1() const { - return f1; + return qApp->FormulaFromUser(f1); } //--------------------------------------------------------------------------------------------------------------------- @@ -463,5 +463,5 @@ QString DialogArc::GetF1() const */ QString DialogArc::GetF2() const { - return f2; + return qApp->FormulaFromUser(f2); } diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 94046df76..84328c2f3 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -271,7 +271,7 @@ void DialogPointOfContact::setCenter(const quint32 &value) */ void DialogPointOfContact::setRadius(const QString &value) { - radius = value; + radius = qApp->FormulaToUser(value); // increase height if needed. if (radius.length() > 80) { @@ -300,7 +300,7 @@ void DialogPointOfContact::SetPointName(const QString &value) */ QString DialogPointOfContact::getRadius() const { - return radius; + return qApp->FormulaFromUser(radius); } //---------------------------------------------------------------------------------------------------------------------