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

Draft: Fixed arrows at endpoints of wires - fixes #2066

Browse Source
This commit is contained in:
Yorik van Havre 2015-11-29 12:47:06 -02:00
parent 76c238fc98
commit 8bc013140e
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4230,24 +4230,39 @@ class _ViewProviderWire(_ViewProviderDraft):
def __init__(self, obj): def __init__(self, obj):
_ViewProviderDraft.__init__(self,obj) _ViewProviderDraft.__init__(self,obj)
obj.addProperty("App::PropertyBool","EndArrow","Draft","Displays a dim symbol at the end of the wire") obj.addProperty("App::PropertyBool","EndArrow","Draft","Displays a dim symbol at the end of the wire")
obj.addProperty("App::PropertyLength","ArrowSize","Draft","Arrow size")
obj.addProperty("App::PropertyEnumeration","ArrowType","Draft","Arrow type")
obj.ArrowSize = getParam("arrowsize",0.1)
obj.ArrowType = arrowtypes
obj.ArrowType = arrowtypes[getParam("dimsymbol",0)]
def attach(self, obj): def attach(self, obj):
from pivy import coin from pivy import coin
self.Object = obj.Object self.Object = obj.Object
col = coin.SoBaseColor() col = coin.SoBaseColor()
col.rgb.setValue(obj.LineColor[0],obj.LineColor[1],obj.LineColor[2]) col.rgb.setValue(obj.LineColor[0],obj.LineColor[1],obj.LineColor[2])
self.coords = coin.SoCoordinate3() self.coords = coin.SoTransform()
self.pt = coin.SoSeparator() self.pt = coin.SoSeparator()
self.pt.addChild(col) self.pt.addChild(col)
self.pt.addChild(self.coords) self.pt.addChild(self.coords)
self.pt.addChild(dimSymbol()) self.symbol = dimSymbol()
self.pt.addChild(self.symbol)
_ViewProviderDraft.attach(self,obj) _ViewProviderDraft.attach(self,obj)
def updateData(self, obj, prop): def updateData(self, obj, prop):
if prop == "Points": if prop == "Points":
if obj.Points: if obj.Points:
p = obj.Points[-1] p = obj.Points[-1]
self.coords.point.setValue((p.x,p.y,p.z)) if hasattr(self,"coords"):
self.coords.translation.setValue((p.x,p.y,p.z))
if len(obj.Points) >= 2:
v1 = obj.Points[-1].sub(obj.Points[-2])
v1.normalize()
import DraftGeomUtils
v2 = DraftGeomUtils.getNormal(obj.Shape)
v3 = v1.cross(v2)
q = FreeCAD.Placement(DraftVecUtils.getPlaneRotation(v1,v3,v2)).Rotation.Q
self.coords.rotation.setValue((q[0],q[1],q[2],q[3]))
return return
def onChanged(self, vp, prop): def onChanged(self, vp, prop):
@ -4255,8 +4270,21 @@ class _ViewProviderWire(_ViewProviderDraft):
rn = vp.RootNode rn = vp.RootNode
if vp.EndArrow: if vp.EndArrow:
rn.addChild(self.pt) rn.addChild(self.pt)
self.onChanged(vp,"ArrowSize")
else: else:
rn.removeChild(self.pt) rn.removeChild(self.pt)
elif prop == "ArrowSize":
if hasattr(vp,"ArrowSize"):
s = vp.ArrowSize
else:
s = getParam("arrowsize",0.1)
self.coords.scaleFactor.setValue((s,s,s))
elif prop == "ArrowType":
if hasattr(self,"pt"):
self.pt.removeChild(self.symbol)
s = arrowtypes.index(vp.ArrowType)
self.symbol = dimSymbol(s)
self.pt.addChild(self.symbol)
_ViewProviderDraft.onChanged(self,vp,prop) _ViewProviderDraft.onChanged(self,vp,prop)
return return