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

[TD] Fix Dimension unit printing problem for US building units and other multivalueschema.

Browse Source
This commit is contained in:
Aapo
2021-01-18 21:52:35 +02:00
parent b263c2aa87
commit 691051e1df
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@@ -647,11 +647,11 @@ bool DrawViewDimension::isMultiValueSchema(void) const
}
Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
if ( (uniSys == Base::UnitSystem::ImperialBuilding) &&
!angularMeasure ) {
if ((uniSys == Base::UnitSystem::ImperialBuilding) &&
!angularMeasure) {
result = true;
} else if ((uniSys == Base::UnitSystem::ImperialCivil) &&
angularMeasure) {
!angularMeasure) {
result = true;
}
return result;
@@ -736,6 +736,13 @@ std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int
qMultiValueStr = formatPrefix + qGenPrefix + displaySub + formatSuffix;
}
formattedValue = qMultiValueStr;
} else if (isMultiValueSchema()) {
qMultiValueStr = qUserString;
if (!genPrefix.empty()) {
//qUserString from Quantity includes units - prefix + R + nnn ft + suffix
qMultiValueStr = formatPrefix + qUserString + formatSuffix;
}
return qMultiValueStr.toStdString();
} else {
if (formatSpecifier.isEmpty()) {
Base::Console().Warning("Warning - no numeric format in Format Spec %s - %s\n",
@@ -810,16 +817,6 @@ std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int
}
}
if ((unitSystem == Base::UnitSystem::ImperialBuilding) &&
!angularMeasure) {
qMultiValueStr = formattedValue;
if (!genPrefix.empty()) {
//qUserString from Quantity includes units - prefix + R + nnn ft + suffix
qMultiValueStr = formatPrefix + qGenPrefix + qUserString + formatSuffix;
}
formattedValue = qMultiValueStr;
}
result = formattedValue.toStdString();
if (partial == 0) {