From d6f31d5c4b673ae87df0e113724de9fa34cf4d63 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sun, 29 May 2016 12:15:35 -0300 Subject: [PATCH] Fixed buggy Building-US units schema --- src/Base/UnitsSchemaImperial1.cpp | 2 +- src/Mod/Draft/Draft.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Base/UnitsSchemaImperial1.cpp b/src/Base/UnitsSchemaImperial1.cpp index c1cd2e632..9f1bbd8aa 100644 --- a/src/Base/UnitsSchemaImperial1.cpp +++ b/src/Base/UnitsSchemaImperial1.cpp @@ -211,7 +211,7 @@ QString UnitsSchemaImperialBuilding::schemaTranslate(Base::Quantity quant,double if (feet > 0) { output << feet << "'"; if ( (inches > 0) || (fraction > 0.0625) ) - output << " - "; + output << " "; } // inches if (inches > 0) { diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 9e1586a2c..603ec1eb4 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3589,7 +3589,8 @@ class _ViewProviderDimension(_ViewProviderDraft): l = self.p3.sub(self.p2).Length # special representation if "Building US" scheme if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Units").GetInt("UserSchema",0) == 5: - self.string = FreeCAD.Units.Quantity(l,FreeCAD.Units.Length).UserString + s = FreeCAD.Units.Quantity(l,FreeCAD.Units.Length).UserString + self.string = s.replace("' ","'- ") elif hasattr(obj.ViewObject,"Decimals"): self.string = DraftGui.displayExternal(l,obj.ViewObject.Decimals,'Length',su) else: