suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: Added a decimals property to Draft Dimensions

Browse Source
This commit is contained in:
Yorik van Havre 2014-01-16 16:18:46 -02:00
parent e99216189c
commit 99e05a3236
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Draft/Draft.py
View File

@ -2905,6 +2905,7 @@ class _ViewProviderDimension(_ViewProviderDraft):
"A View Provider for the Draft Dimension object" "A View Provider for the Draft Dimension object"
def __init__(self, obj): def __init__(self, obj):
obj.addProperty("App::PropertyLength","FontSize","Draft","Font size") obj.addProperty("App::PropertyLength","FontSize","Draft","Font size")
obj.addProperty("App::PropertyInteger","Decimals","Draft","The number of decimals to show")
obj.addProperty("App::PropertyLength","ArrowSize","Draft","Arrow size") obj.addProperty("App::PropertyLength","ArrowSize","Draft","Arrow size")
obj.addProperty("App::PropertyLength","TextSpacing","Draft","The spacing between the text and the dimension line") obj.addProperty("App::PropertyLength","TextSpacing","Draft","The spacing between the text and the dimension line")
obj.addProperty("App::PropertyEnumeration","ArrowType","Draft","Arrow type") obj.addProperty("App::PropertyEnumeration","ArrowType","Draft","Arrow type")
@ -2922,6 +2923,7 @@ class _ViewProviderDimension(_ViewProviderDraft):
obj.ArrowType = arrowtypes obj.ArrowType = arrowtypes
obj.ArrowType = arrowtypes[getParam("dimsymbol",0)] obj.ArrowType = arrowtypes[getParam("dimsymbol",0)]
obj.ExtLines = getParam("extlines",0.3) obj.ExtLines = getParam("extlines",0.3)
obj.Decimals = getParam("dimPrecision",2)
_ViewProviderDraft.__init__(self,obj) _ViewProviderDraft.__init__(self,obj)
def attach(self, vobj): def attach(self, vobj):
@ -3053,7 +3055,10 @@ class _ViewProviderDimension(_ViewProviderDraft):
# set text value # set text value
l = self.p3.sub(self.p2).Length l = self.p3.sub(self.p2).Length
fstring = "%." + str(getParam("dimPrecision",2)) + "f" if hasattr(obj.ViewObject,"Decimals"):
fstring = "%." + str(obj.ViewObject.Decimals) + "f"
else:
fstring = "%." + str(getParam("dimPrecision",2)) + "f"
self.string = (fstring % l) self.string = (fstring % l)
if obj.ViewObject.Override: if obj.ViewObject.Override:
self.string = unicode(obj.ViewObject.Override).encode("latin1").replace("$dim",self.string) self.string = unicode(obj.ViewObject.Override).encode("latin1").replace("$dim",self.string)
@ -3089,7 +3094,7 @@ class _ViewProviderDimension(_ViewProviderDraft):
def onChanged(self, vobj, prop): def onChanged(self, vobj, prop):
"called when a view property has changed" "called when a view property has changed"
if prop in ["ExtLines","TextSpacing","DisplayMode","Override","FlipArrows"]: if prop in ["ExtLines","TextSpacing","DisplayMode","Override","FlipArrows","Decimals"]:
self.updateData(vobj.Object,"Start") self.updateData(vobj.Object,"Start")
elif prop == "FontSize": elif prop == "FontSize":
if hasattr(self,"font"): if hasattr(self,"font"):
@ -3232,6 +3237,7 @@ class _ViewProviderAngularDimension(_ViewProviderDraft):
"A View Provider for the Draft Angular Dimension object" "A View Provider for the Draft Angular Dimension object"
def __init__(self, obj): def __init__(self, obj):
obj.addProperty("App::PropertyLength","FontSize","Draft","Font size") obj.addProperty("App::PropertyLength","FontSize","Draft","Font size")
obj.addProperty("App::PropertyInteger","Decimals","Draft","The number of decimals to show")
obj.addProperty("App::PropertyString","FontName","Draft","Font name") obj.addProperty("App::PropertyString","FontName","Draft","Font name")
obj.addProperty("App::PropertyLength","ArrowSize","Draft","Arrow size") obj.addProperty("App::PropertyLength","ArrowSize","Draft","Arrow size")
obj.addProperty("App::PropertyLength","TextSpacing","Draft","The spacing between the text and the dimension line") obj.addProperty("App::PropertyLength","TextSpacing","Draft","The spacing between the text and the dimension line")
@ -3248,6 +3254,7 @@ class _ViewProviderAngularDimension(_ViewProviderDraft):
obj.ArrowType = arrowtypes obj.ArrowType = arrowtypes
obj.ArrowType = arrowtypes[getParam("dimsymbol",0)] obj.ArrowType = arrowtypes[getParam("dimsymbol",0)]
obj.Override = '' obj.Override = ''
obj.Decimals = getParam("dimPrecision",2)
_ViewProviderDraft.__init__(self,obj) _ViewProviderDraft.__init__(self,obj)
def attach(self, vobj): def attach(self, vobj):
@ -3326,7 +3333,10 @@ class _ViewProviderAngularDimension(_ViewProviderDraft):
a = obj.LastAngle - obj.FirstAngle a = obj.LastAngle - obj.FirstAngle
else: else:
a = (360 - obj.FirstAngle) + obj.LastAngle a = (360 - obj.FirstAngle) + obj.LastAngle
fstring = "%." + str(getParam("dimPrecision",2)) + "f" if hasattr(obj.ViewObject,"Decimals"):
fstring = "%." + str(obj.ViewObject.Decimals) + "f"
else:
fstring = "%." + str(getParam("dimPrecision",2)) + "f"
self.string = (fstring % a) self.string = (fstring % a)
self.string += " d" self.string += " d"
if obj.ViewObject.Override: if obj.ViewObject.Override: