diff --git a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
index b9dbf39f0..1ee4cf7fd 100644
--- a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
+++ b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
@@ -169,22 +169,14 @@ void VisToolMove::RefreshGeometry()
{
SetToolTip(tr("Length = %1%2, angle = %3°, %4 - sticking angle, "
"Mouse click - finish selecting a position")
- .arg(VAbstractApplication::VApp()->TrVars()->FormulaToUser(
- QString::number(VAbstractValApplication::VApp()->fromPixel(tempLength)),
- VAbstractApplication::VApp()->Settings()->GetOsSeparator()), prefix)
- .arg(tempAngle)
- .arg(VModifierKey::Shift()));
+ .arg(LengthToUser(tempLength), prefix, AngleToUser(tempAngle), VModifierKey::Shift()));
}
else
{
SetToolTip(tr("Length = %1%2, angle = %3°, rotation angle = %4°, %5 - sticking angle, "
"%6 - change rotation origin point, Mouse click - finish creating")
- .arg(VAbstractApplication::VApp()->TrVars()->FormulaToUser(
- QString::number(VAbstractValApplication::VApp()->fromPixel(tempLength)),
- VAbstractApplication::VApp()->Settings()->GetOsSeparator()), prefix)
- .arg(tempAngle)
- .arg(tempRoationAngle)
- .arg(VModifierKey::Shift(), VModifierKey::Control()));
+ .arg(LengthToUser(tempLength), prefix, AngleToUser(tempAngle), AngleToUser(tempRoationAngle),
+ VModifierKey::Shift(), VModifierKey::Control()));
}
CreateMovedRotatedObjects(iPoint, iCurve, tempLength, tempAngle, tempRoationAngle, origin);
diff --git a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp
index 244a56d2b..f30d783a6 100644
--- a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp
+++ b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp
@@ -114,8 +114,7 @@ void VisToolRotation::RefreshGeometry()
SetToolTip(tr("Rotating angle = %1°, %2 - sticking angle, "
"Mouse click - finish creation")
- .arg(tempAngle)
- .arg(VModifierKey::Shift()));
+ .arg(AngleToUser(tempAngle), VModifierKey::Shift()));
}
int iPoint = -1;
diff --git a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
index a997166c9..652e2ce22 100644
--- a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
@@ -92,8 +92,7 @@ void VisToolCurveIntersectAxis::RefreshGeometry()
SetToolTip(tr("Intersection curve and axis: angle = %1°; %2 - "
"sticking angle, %3 - finish creation")
- .arg(this->line().angle())
- .arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
+ .arg(AngleToUser(this->line().angle()), VModifierKey::Shift(), VModifierKey::EnterKey()));
}
}
}
diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp
index c9bb36a5c..6d7bbc2c4 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolendline.cpp
@@ -88,12 +88,8 @@ void VisToolEndLine::RefreshGeometry()
static const QString prefix = UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true);
SetToolTip(tr("Point at distance and angle: angle = %1°, length = %2%3; "
"%4 - sticking angle, %5 - finish creation")
- .arg(this->line().angle())
- .arg(VAbstractApplication::VApp()->TrVars()
- ->FormulaToUser(
- QString::number(VAbstractValApplication::VApp()->fromPixel(this->line().length())),
- VAbstractApplication::VApp()->Settings()->GetOsSeparator()),
- prefix, VModifierKey::Shift(), VModifierKey::EnterKey()));
+ .arg(AngleToUser(this->line().angle()), LengthToUser(this->line().length()), prefix,
+ VModifierKey::Shift(), VModifierKey::EnterKey()));
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
index bbcf78a8a..aef6d2de6 100644
--- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
+++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
@@ -107,8 +107,8 @@ void VisToolLineIntersectAxis::RefreshGeometry()
SetToolTip(tr("Intersection line and axis: angle = %1°; %2 - "
"sticking angle, %3 - finish creation")
- .arg(this->line().angle())
- .arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
+ .arg(AngleToUser(this->line().angle()), VModifierKey::Shift(),
+ VModifierKey::EnterKey()));
}
}
}
diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp
index 7ef844745..e8290ac26 100644
--- a/src/libs/vtools/visualization/path/vistoolarc.cpp
+++ b/src/libs/vtools/visualization/path/vistoolarc.cpp
@@ -112,9 +112,8 @@ void VisToolArc::RefreshGeometry()
"Mouse click - finish selecting the first angle, "
"%4 - sticking angle, "
"%5 - skip")
- .arg(LengthToUser(m_radius), prefix)
- .arg(f1Angle)
- .arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
+ .arg(LengthToUser(m_radius), prefix, AngleToUser(f1Angle), VModifierKey::Shift(),
+ VModifierKey::EnterKey()));
}
else if (m_f1 >= 0)
{
@@ -129,10 +128,8 @@ void VisToolArc::RefreshGeometry()
"%5 - sticking angle, "
"%6 - sticking end, "
"%7 - skip")
- .arg(LengthToUser(m_radius), prefix)
- .arg(m_f1)
- .arg(f2Angle)
- .arg(VModifierKey::Shift(), VModifierKey::Control(), VModifierKey::EnterKey()));
+ .arg(LengthToUser(m_radius), prefix, AngleToUser(m_f1), AngleToUser(f2Angle),
+ VModifierKey::Shift(), VModifierKey::Control(), VModifierKey::EnterKey()));
}
}
else
diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
index 14184c7af..bd3c9234c 100644
--- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
+++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
@@ -109,9 +109,8 @@ void VisToolArcWithLength::RefreshGeometry()
"Mouse click - finish selecting the first angle, "
"%4 - sticking angle, "
"%5 - skip")
- .arg(LengthToUser(m_radius), prefix)
- .arg(f1Angle)
- .arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
+ .arg(LengthToUser(m_radius), prefix, AngleToUser(f1Angle), VModifierKey::Shift(),
+ VModifierKey::EnterKey()));
}
else if (m_f1 >= 0)
{
@@ -123,9 +122,8 @@ void VisToolArcWithLength::RefreshGeometry()
SetToolTip(tr("Arc: radius = %1%2, first angle = %3°, arc length = %4%2; "
"Mouse click - finish creating, "
"%5 - skip")
- .arg(LengthToUser(m_radius), prefix)
- .arg(m_f1)
- .arg(LengthToUser(arc.GetLength()), VModifierKey::EnterKey()));
+ .arg(LengthToUser(m_radius), prefix, AngleToUser(m_f1), LengthToUser(arc.GetLength()),
+ VModifierKey::EnterKey()));
}
}
else