From 5262d8afb7d821cb4685b5b59cce1eba2b7a0f68 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 24 Aug 2022 19:53:29 +0300 Subject: [PATCH] Refactoring. Rename Visualization::NumberToUser to Visualization::LengthToUser to avoid confusion. Add Visualization::AngleToUser. --- src/libs/vgeometry/vellipticalarc.cpp | 2 -- src/libs/vtools/visualization/line/vistoolalongline.cpp | 2 +- src/libs/vtools/visualization/line/vistoolbisector.cpp | 2 +- src/libs/vtools/visualization/line/vistoolnormal.cpp | 2 +- .../line/vistoolpointfromcircleandtangent.cpp | 2 +- .../line/vistoolpointofintersectioncircles.cpp | 4 ++-- .../vtools/visualization/line/vistoolshoulderpoint.cpp | 2 +- src/libs/vtools/visualization/path/vistoolarc.cpp | 6 +++--- .../vtools/visualization/path/vistoolarcwithlength.cpp | 8 ++++---- src/libs/vtools/visualization/path/vistoolcutarc.cpp | 2 +- src/libs/vtools/visualization/path/vistoolcutspline.cpp | 2 +- .../vtools/visualization/path/vistoolcutsplinepath.cpp | 2 +- src/libs/vtools/visualization/visualization.cpp | 9 ++++++++- src/libs/vtools/visualization/visualization.h | 3 ++- 14 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp index d41d2b1a3..0811168da 100644 --- a/src/libs/vgeometry/vellipticalarc.cpp +++ b/src/libs/vgeometry/vellipticalarc.cpp @@ -34,14 +34,12 @@ #include #include "../vmisc/def.h" -#include "../vmisc/vmath.h" #include "../ifc/ifcdef.h" #include "../ifc/exception/vexception.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/compatibility.h" #include "vabstractcurve.h" #include "vellipticalarc_p.h" -#include "vspline.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/visualization/line/vistoolalongline.cpp b/src/libs/vtools/visualization/line/vistoolalongline.cpp index 933c39f37..8837bccf8 100644 --- a/src/libs/vtools/visualization/line/vistoolalongline.cpp +++ b/src/libs/vtools/visualization/line/vistoolalongline.cpp @@ -116,7 +116,7 @@ void VisToolAlongLine::RefreshGeometry() SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " "%3 - skip") - .arg(NumberToUser(len), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(len), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/line/vistoolbisector.cpp b/src/libs/vtools/visualization/line/vistoolbisector.cpp index 5c4caa7f7..c63138b15 100644 --- a/src/libs/vtools/visualization/line/vistoolbisector.cpp +++ b/src/libs/vtools/visualization/line/vistoolbisector.cpp @@ -132,7 +132,7 @@ void VisToolBisector::RefreshGeometry() SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " "%3 - skip") - .arg(NumberToUser(len), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(len), prefix, VModifierKey::EnterKey())); } else { diff --git a/src/libs/vtools/visualization/line/vistoolnormal.cpp b/src/libs/vtools/visualization/line/vistoolnormal.cpp index 0d81770ac..e53a93ef9 100644 --- a/src/libs/vtools/visualization/line/vistoolnormal.cpp +++ b/src/libs/vtools/visualization/line/vistoolnormal.cpp @@ -113,7 +113,7 @@ void VisToolNormal::RefreshGeometry() SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " "%3 - skip") - .arg(NumberToUser(len), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(len), prefix, VModifierKey::EnterKey())); } else { diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp index 5f4774b3c..d8f47b308 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp @@ -98,7 +98,7 @@ void VisToolPointFromCircleAndTangent::RefreshGeometry() SetToolTip(tr("Radius = %1%2; " "Mouse click - finish selecting the radius, " "%3 - skip") - .arg(NumberToUser(len), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(len), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 8105cb7c4..261237bf3 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp @@ -109,7 +109,7 @@ void VisToolPointOfIntersectionCircles::RefreshGeometry() SetToolTip(tr("Radius = %1%2; " "Mouse click - finish selecting the second radius, " "%3 - skip") - .arg(NumberToUser(length), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(length), prefix, VModifierKey::EnterKey())); } } } @@ -125,7 +125,7 @@ void VisToolPointOfIntersectionCircles::RefreshGeometry() SetToolTip(tr("Radius = %1%2; " "Mouse click - finish selecting the first radius, " "%3 - skip") - .arg(NumberToUser(length), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(length), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp index 1d8347dce..e5c505f4a 100644 --- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp @@ -121,7 +121,7 @@ void VisToolShoulderPoint::RefreshGeometry() SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " "%3 - skip") - .arg(NumberToUser(len), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(len), prefix, VModifierKey::EnterKey())); } else { diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp index bb9f53673..7ef844745 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolarc.cpp @@ -92,7 +92,7 @@ void VisToolArc::RefreshGeometry() SetToolTip(tr("Arc: radius = %1%2; " "Mouse click - finish selecting the radius, " - "%3 - skip").arg(NumberToUser(r.length()), prefix, VModifierKey::EnterKey())); + "%3 - skip").arg(LengthToUser(r.length()), prefix, VModifierKey::EnterKey())); } else if (m_f1 < 0) { @@ -112,7 +112,7 @@ void VisToolArc::RefreshGeometry() "Mouse click - finish selecting the first angle, " "%4 - sticking angle, " "%5 - skip") - .arg(NumberToUser(m_radius), prefix) + .arg(LengthToUser(m_radius), prefix) .arg(f1Angle) .arg(VModifierKey::Shift(), VModifierKey::EnterKey())); } @@ -129,7 +129,7 @@ void VisToolArc::RefreshGeometry() "%5 - sticking angle, " "%6 - sticking end, " "%7 - skip") - .arg(NumberToUser(m_radius), prefix) + .arg(LengthToUser(m_radius), prefix) .arg(m_f1) .arg(f2Angle) .arg(VModifierKey::Shift(), VModifierKey::Control(), VModifierKey::EnterKey())); diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp index 322fd9181..14184c7af 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp @@ -89,7 +89,7 @@ void VisToolArcWithLength::RefreshGeometry() SetToolTip(tr("Arc: radius = %1%2; " "Mouse click - finish selecting the radius, " - "%3 - skip").arg(NumberToUser(r.length()), prefix, VModifierKey::EnterKey())); + "%3 - skip").arg(LengthToUser(r.length()), prefix, VModifierKey::EnterKey())); } else if (m_f1 < 0) { @@ -109,7 +109,7 @@ void VisToolArcWithLength::RefreshGeometry() "Mouse click - finish selecting the first angle, " "%4 - sticking angle, " "%5 - skip") - .arg(NumberToUser(m_radius), prefix) + .arg(LengthToUser(m_radius), prefix) .arg(f1Angle) .arg(VModifierKey::Shift(), VModifierKey::EnterKey())); } @@ -123,9 +123,9 @@ void VisToolArcWithLength::RefreshGeometry() SetToolTip(tr("Arc: radius = %1%2, first angle = %3°, arc length = %4%2; " "Mouse click - finish creating, " "%5 - skip") - .arg(NumberToUser(m_radius), prefix) + .arg(LengthToUser(m_radius), prefix) .arg(m_f1) - .arg(NumberToUser(arc.GetLength()), VModifierKey::EnterKey())); + .arg(LengthToUser(arc.GetLength()), VModifierKey::EnterKey())); } } else diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.cpp b/src/libs/vtools/visualization/path/vistoolcutarc.cpp index 13574772c..b5ec6f498 100644 --- a/src/libs/vtools/visualization/path/vistoolcutarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutarc.cpp @@ -86,7 +86,7 @@ void VisToolCutArc::RefreshGeometry() const QString prefix = UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true); SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " - "%3 - skip").arg(NumberToUser(length), prefix, VModifierKey::EnterKey())); + "%3 - skip").arg(LengthToUser(length), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.cpp b/src/libs/vtools/visualization/path/vistoolcutspline.cpp index 91cf35d4c..b21a79719 100644 --- a/src/libs/vtools/visualization/path/vistoolcutspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutspline.cpp @@ -96,7 +96,7 @@ void VisToolCutSpline::RefreshGeometry() const QString prefix = UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true); SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " - "%3 - skip").arg(NumberToUser(length), prefix, VModifierKey::EnterKey())); + "%3 - skip").arg(LengthToUser(length), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp index 80321be74..94a88af06 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp @@ -99,7 +99,7 @@ void VisToolCutSplinePath::RefreshGeometry() SetToolTip(tr("Length = %1%2; " "Mouse click - finish selecting the length, " "%3 - skip") - .arg(NumberToUser(length), prefix, VModifierKey::EnterKey())); + .arg(LengthToUser(length), prefix, VModifierKey::EnterKey())); } } } diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 7a5a94601..beffaea60 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -308,13 +308,20 @@ auto Visualization::GetCurveItem(QVector &curves, quint32 i, c } //--------------------------------------------------------------------------------------------------------------------- -auto Visualization::NumberToUser(qreal value) -> QString +auto Visualization::LengthToUser(qreal value) -> QString { return VAbstractApplication::VApp()->TrVars() ->FormulaToUser(QString::number(VAbstractValApplication::VApp()->fromPixel(value)), VAbstractApplication::VApp()->Settings()->GetOsSeparator()); } +//--------------------------------------------------------------------------------------------------------------------- +auto Visualization::AngleToUser(qreal value) -> QString +{ + return VAbstractApplication::VApp()->TrVars() + ->FormulaToUser(QString::number(value), VAbstractApplication::VApp()->Settings()->GetOsSeparator()); +} + //--------------------------------------------------------------------------------------------------------------------- void Visualization::SetColor(VColor type, const QColor& color) { diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index 1f1846578..e6db2f63b 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -119,7 +119,8 @@ protected: static auto GetCurveItem(QVector &curves, quint32 i, const QColor &color, QGraphicsItem *parent) -> VCurvePathItem *; - static auto NumberToUser(qreal value) -> QString; + static auto LengthToUser(qreal value) -> QString; + static auto AngleToUser(qreal value) -> QString; void SetColor(VColor type, const QColor& color);