From d10e06039d73b420cf5dc48d6f0922e204340ed2 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Wed, 5 Dec 2018 15:41:25 -0500
Subject: [PATCH] Display correct symbols for Minute/Second

- the ImperialCivil unit schema uses "M" for angular
  minutes and "S" for angular seconds. These must be
  replaced by ' and ".
---
 src/Mod/TechDraw/App/DrawViewDimension.cpp | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 3d464cbc1d..6586fdf2ce 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -439,14 +439,6 @@ std::string  DrawViewDimension::getFormatedValue(bool obtuse)
         return FormatSpec.getStrValue();
     }
 
-    //units api: get schema to figure out if this is multi-value schema(Imperial1, ImperialBuilding)
-    //if it is multi-unit schema, don't even try to use Alt Decimals or format per format spec
-    bool multiValueUnits = false;
-    Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
-    if ( (uniSys == Base::UnitSystem::Imperial1) ||
-         (uniSys == Base::UnitSystem::ImperialBuilding) ) {
-        multiValueUnits = true;
-    }
     QString specStr = QString::fromUtf8(FormatSpec.getStrValue().data(),FormatSpec.getStrValue().size());
     double val = std::abs(getDimValue());    //internal units!
     
@@ -470,11 +462,25 @@ std::string  DrawViewDimension::getFormatedValue(bool obtuse)
                                                                       // really should be able to ask units for value
                                                                       // in appropriate UoM!!
 
-    if (multiValueUnits  &&
-        !angularMeasure) {
+    //units api: get schema to figure out if this is multi-value schema(Imperial1, ImperialBuilding, etc)
+    //if it is multi-unit schema, don't even try to use Alt Decimals or format per format spec
+    Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
+
+//handle multi value schemes
+    if (((uniSys == Base::UnitSystem::Imperial1) ||
+         (uniSys == Base::UnitSystem::ImperialBuilding) ) &&
+         !angularMeasure) {
         specStr = userStr;
+    } else if ((uniSys == Base::UnitSystem::ImperialCivil) &&
+         angularMeasure) {
+        QString dispMinute = QString::fromUtf8("\'");
+        QString dispSecond = QString::fromUtf8("\"");
+        QString schemeMinute = QString::fromUtf8("M");
+        QString schemeSecond = QString::fromUtf8("S");
+        specStr = userStr.replace(schemeMinute,dispMinute);
+        specStr = specStr.replace(schemeSecond,dispSecond);
     } else {
-        //should be able to handle angular Measures even in ft-in systems
+//handle single value schemes
         QRegExp rxUnits(QString::fromUtf8(" \\D*$"));                     //space + any non digits at end of string
 
         QString userVal = userStr;