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

Merge branch 'origin/master'

Browse Source
This commit is contained in:
jriegel 2014-04-14 06:44:59 +02:00
commit 9a52d06dd5
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2614,7 +2614,7 @@ def downgrade(objects,delete=False,force=None):
if not isinstance(objects,list): if not isinstance(objects,list):
objects = [objects] objects = [objects]
global deleteList, newList global deleteList, addList
deleteList = [] deleteList = []
addList = [] addList = []
@ -2753,7 +2753,10 @@ def downgrade(objects,delete=False,force=None):
# special case, we have one parametric object: we "de-parametrize" it # special case, we have one parametric object: we "de-parametrize" it
elif (len(objects) == 1) and (objects[0].isDerivedFrom("Part::Feature")) and ("Base" in objects[0].PropertiesList): elif (len(objects) == 1) and (objects[0].isDerivedFrom("Part::Feature")) and ("Base" in objects[0].PropertiesList):
result = shapify(objects[0]) result = shapify(objects[0])
if result: msg(translate("draft", "Found 1 parametric object: breaking its dependencies\n")) if result:
msg(translate("draft", "Found 1 parametric object: breaking its dependencies\n"))
addList.append(result)
#deleteList.append(objects[0])
# we have only 2 objects: cut 2nd from 1st # we have only 2 objects: cut 2nd from 1st
elif len(objects) == 2: elif len(objects) == 2:
@ -3125,10 +3128,11 @@ class _ViewProviderDimension(_ViewProviderDraft):
if proj: if proj:
self.p2 = self.p1.add(proj.negative()) self.p2 = self.p1.add(proj.negative())
self.p3 = self.p4.add(proj.negative()) self.p3 = self.p4.add(proj.negative())
dmax = obj.ViewObject.ExtLines.Value if hasattr(obj.ViewObject,"ExtLines"):
if dmax and (proj.Length > dmax): dmax = obj.ViewObject.ExtLines.Value
self.p1 = self.p2.add(DraftVecUtils.scaleTo(proj,dmax)) if dmax and (proj.Length > dmax):
self.p4 = self.p3.add(DraftVecUtils.scaleTo(proj,dmax)) self.p1 = self.p2.add(DraftVecUtils.scaleTo(proj,dmax))
self.p4 = self.p3.add(DraftVecUtils.scaleTo(proj,dmax))
else: else:
self.p2 = self.p1 self.p2 = self.p1
self.p3 = self.p4 self.p3 = self.p4
@ -3187,12 +3191,13 @@ class _ViewProviderDimension(_ViewProviderDraft):
else: else:
fstring = "%." + str(getParam("dimPrecision",2)) + "f" fstring = "%." + str(getParam("dimPrecision",2)) + "f"
self.string = (fstring % l) self.string = (fstring % l)
if obj.ViewObject.Override: if hasattr(obj.ViewObject,"Override"):
try: if obj.ViewObject.Override:
# only available in Coin3D >= 4.0 try:
self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string) # only available in Coin3D >= 4.0
except: self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string)
self.string = unicode(obj.ViewObject.Override).encode("latin1").replace("$dim",self.string) except:
self.string = unicode(obj.ViewObject.Override).encode("latin1").replace("$dim",self.string)
self.text.string = self.text3d.string = self.string self.text.string = self.text3d.string = self.string
# set the distance property # set the distance property
@ -3225,22 +3230,22 @@ 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 == "FontSize": if (prop == "FontSize") and hasattr(vobj,"FontSize"):
if hasattr(self,"font"): if hasattr(self,"font"):
self.font.size = vobj.FontSize.Value self.font.size = vobj.FontSize.Value
if hasattr(self,"font3d"): if hasattr(self,"font3d"):
self.font3d.size = vobj.FontSize.Value*100 self.font3d.size = vobj.FontSize.Value*100
elif prop == "FontName": elif (prop == "FontName") and hasattr(vobj,"FontName"):
if hasattr(self,"font") and hasattr(self,"font3d"): if hasattr(self,"font") and hasattr(self,"font3d"):
self.font.name = self.font3d.name = str(vobj.FontName) self.font.name = self.font3d.name = str(vobj.FontName)
elif prop == "LineColor": elif (prop == "LineColor") and hasattr(vobj,"LineColor"):
if hasattr(self,"color"): if hasattr(self,"color"):
c = vobj.LineColor c = vobj.LineColor
self.color.rgb.setValue(c[0],c[1],c[2]) self.color.rgb.setValue(c[0],c[1],c[2])
elif prop == "LineWidth": elif (prop == "LineWidth") and hasattr(vobj,"LineWidth"):
if hasattr(self,"drawstyle"): if hasattr(self,"drawstyle"):
self.drawstyle.lineWidth = vobj.LineWidth self.drawstyle.lineWidth = vobj.LineWidth
elif prop in ["ArrowSize","ArrowType"]: elif (prop in ["ArrowSize","ArrowType"]) and hasattr(vobj,"ArrowSize"):
if hasattr(self,"node") and hasattr(self,"p2"): if hasattr(self,"node") and hasattr(self,"p2"):
from pivy import coin from pivy import coin