Draft: Allow to set 'arch' unit override on dimensions

FreeCAD · Apr 29, 2021 · e2e3806 · e2e3806
1 parent 1b09fec
commit e2e3806
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Mod/Draft/draftutils/units.py b/src/Mod/Draft/draftutils/units.py
@@ -100,10 +100,16 @@ def display_external(internal_value,
 
             conversion = q.getUserPreferred()[1]
             uom = q.getUserPreferred()[2]
+        elif unit.lower() == "arch":
+            return App.Units.schemaTranslate(q,5)[0].replace("+"," ")
         else:
-            uom = unit
-            internal_value = q.getValueAs(unit)
-            conversion = 1
+            try:
+                uom = unit
+                internal_value = q.getValueAs(unit)
+                conversion = 1
+            except:
+                conversion = q.getUserPreferred()[1]
+                uom = q.getUserPreferred()[2]
     elif dim == 'Angle':
         return App.Units.Quantity(internal_value, App.Units.Angle).UserString
     else:

diff --git a/src/Mod/Draft/draftviewproviders/view_dimension.py b/src/Mod/Draft/draftviewproviders/view_dimension.py
@@ -211,7 +211,8 @@ def set_units_properties(self, vobj, properties):
         if "UnitOverride" not in properties:
             _tip = QT_TRANSLATE_NOOP("App::Property",
                                      "A unit to express the measurement.\n"
-                                     "Leave blank for system default")
+                                     "Leave blank for system default.\n"
+                                     "Use 'arch' to force US arch notation")
             vobj.addProperty("App::PropertyString",
                              "UnitOverride",
                              "Units",