From 223725ca82546bdfe925e980bc25a6d224061958 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 9 Jul 2016 14:01:07 -0300 Subject: [PATCH] Temporary workaround for the fractions issue in new imperial unit schema (using + between inches and fractions) --- src/Base/UnitsSchemaImperial1.cpp | 2 +- src/Mod/Draft/Draft.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Base/UnitsSchemaImperial1.cpp b/src/Base/UnitsSchemaImperial1.cpp index 6506b166e..bf72b5e43 100644 --- a/src/Base/UnitsSchemaImperial1.cpp +++ b/src/Base/UnitsSchemaImperial1.cpp @@ -219,7 +219,7 @@ QString UnitsSchemaImperialBuilding::schemaTranslate(Base::Quantity quant,double if (inches > 0) { output << inches; if (fraction > 0.0625) - output << " "; + output << "+"; else output << "\""; } diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 1638d0d7e..0c9561362 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3606,6 +3606,7 @@ class _ViewProviderDimension(_ViewProviderDraft): if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Units").GetInt("UserSchema",0) == 5: s = FreeCAD.Units.Quantity(l,FreeCAD.Units.Length).UserString self.string = s.replace("' ","'- ") + self.string = s.replace("+"," ") elif hasattr(obj.ViewObject,"Decimals"): self.string = DraftGui.displayExternal(l,obj.ViewObject.Decimals,'Length',su) else: