kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

QuickMeasure: display correct angle units

Browse Source 
Add angle unit user string getter, fix typos for length unit equivalent

Fixes #19307
This commit is contained in:
panintended
2025-01-30 10:40:43 +01:00
committed by Chris Hennes
parent 9e5508513c
commit 0511a4d04d
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Measure/Gui/QuickMeasure.cpp
View File

@@ -185,12 +185,18 @@ static QString areaStr(double value)
return QString::fromStdString(area.getUserString());
}
static QString lenghtStr(double value)
static QString lengthStr(double value)
{
Base::Quantity dist(value, Base::Unit::Length);
return QString::fromStdString(dist.getUserString());
}
static QString angleStr(double value)
{
Base::Quantity dist(value, Base::Unit::Angle);
return QString::fromStdString(dist.getUserString());
}
void QuickMeasure::printResult()
{
MeasureType mtype = measurement->getType();
@@ -206,7 +212,7 @@ void QuickMeasure::printResult()
%2").arg(vol.getSafeUserString()).arg(area.getSafeUserString()));
}*/
else if (mtype == MeasureType::TwoPlanes) {
print(tr("Nominal distance: %1").arg(lenghtStr(measurement->planePlaneDistance())));
print(tr("Nominal distance: %1").arg(lengthStr(measurement->planePlaneDistance())));
}
else if (mtype == MeasureType::Cone || mtype == MeasureType::Plane) {
print(tr("Area: %1").arg(areaStr(measurement->area())));
@@ -214,29 +220,29 @@ void QuickMeasure::printResult()
else if (mtype == MeasureType::Cylinder || mtype == MeasureType::Sphere
|| mtype == MeasureType::Torus) {
print(tr("Area: %1, Radius: %2")
.arg(areaStr(measurement->area()), lenghtStr(measurement->radius())));
.arg(areaStr(measurement->area()), lengthStr(measurement->radius())));
}
else if (mtype == MeasureType::Edges) {
print(tr("Total length: %1").arg(lenghtStr(measurement->length())));
print(tr("Total length: %1").arg(lengthStr(measurement->length())));
}
else if (mtype == MeasureType::TwoParallelLines) {
print(tr("Nominal distance: %1").arg(lenghtStr(measurement->lineLineDistance())));
print(tr("Nominal distance: %1").arg(lengthStr(measurement->lineLineDistance())));
}
else if (mtype == MeasureType::TwoLines) {
print(tr("Angle: %1, Total length: %2")
.arg(lenghtStr(measurement->angle()), lenghtStr(measurement->length())));
.arg(angleStr(measurement->angle()), lengthStr(measurement->length())));
}
else if (mtype == MeasureType::Line) {
print(tr("Length: %1").arg(lenghtStr(measurement->length())));
print(tr("Length: %1").arg(lengthStr(measurement->length())));
}
else if (mtype == MeasureType::Circle) {
print(tr("Radius: %1").arg(lenghtStr(measurement->radius())));
print(tr("Radius: %1").arg(lengthStr(measurement->radius())));
}
else if (mtype == MeasureType::PointToPoint) {
print(tr("Distance: %1").arg(lenghtStr(measurement->length())));
print(tr("Distance: %1").arg(lengthStr(measurement->length())));
}
else if (mtype == MeasureType::PointToEdge || mtype == MeasureType::PointToSurface) {
print(tr("Minimum distance: %1").arg(lenghtStr(measurement->length())));
print(tr("Minimum distance: %1").arg(lengthStr(measurement->length())));
}
else {
print(QString::fromLatin1(""));