Merge pull request #4291 from aapo-aapo/TD-US-MultiValueSchema-fix

[TD] Fix Dimension unit printing problem for US building units …
FreeCAD · Jan 21, 2021 · c06cd3c · c06cd3c
2 parents d703840 + 1c02a2a
commit c06cd3c
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -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) {