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

TechDraw: Refactor use of Unit Schema values

Browse Source 
Quantity's getUserString already returns both factor and unitText.
This commit is contained in:
Ladislav Michl
2025-12-01 15:18:04 +01:00
parent a509bc2ee9
commit 3252aaf618
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/TechDraw/App/DimensionFormatter.cpp
View File

@@ -51,7 +51,7 @@ std::string DimensionFormatter::formatValue(const qreal value,
const Format partial,
const bool isDim) const
{
bool distanceMeasure{true};
bool distanceMeasure{true};
const bool angularMeasure =
m_dimension->Type.isValue("Angle") || m_dimension->Type.isValue("Angle3Pt");
const bool areaMeasure = m_dimension->Type.isValue("Area");
@@ -101,7 +101,9 @@ std::string DimensionFormatter::formatValue(const qreal value,
formatSpecifier.replace(QStringLiteral("%g"), newSpecifier, Qt::CaseInsensitive);
}
std::string unitText = Base::UnitsApi::getUnitText(asQuantity);
double factor{1.0};
std::string unitText{""};
asQuantity.getUserString(factor, unitText);
std::string super2{"²"};
std::string squareTag{"^2"};
@@ -118,8 +120,7 @@ std::string DimensionFormatter::formatValue(const qreal value,
double userVal = asQuantity.getValue();
if (distanceMeasure || areaMeasure) {
const double convertValue = Base::Quantity::parse("1" + unitText).getValue();
userVal /= convertValue;
userVal /= factor;
}
// convert ^2 to superscript 2 for display