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

sys_sympy: fix angle constraint

Browse Source
This commit is contained in:
Zheng, Lei 2017-12-09 13:25:36 +08:00
parent 584c53d619
commit f72e048295
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys_sympy.py
View File

@ -423,11 +423,9 @@ def _pointLineDistance(wrkpln,pt,line):
return eab.cross(ea-ep).magnitude()/eab.magnitude() return eab.cross(ea-ep).magnitude()/eab.magnitude()
def _directionConsine(wrkpln,l1,l2,supplement=False): def _directionConsine(wrkpln,l1,l2,supplement=False):
l1p1,l1p2,l2p1,l2p2 = _project(wrkpln,l1.p1,l1.p2,l2.p1,l2.p2) v1,v2 = _project(wrkpln,l1,l2)
v1 = l1p1-l1p2
if supplement: if supplement:
v1 = v1 * -1.0 v1 = v1 * -1.0
v2 = l2p1-l2p2
return v1.cross(v2)/(v1.magnitude()*v2.magnitude()) return v1.cross(v2)/(v1.magnitude()*v2.magnitude())
_x = 'i' _x = 'i'
@ -923,7 +921,7 @@ class _Angle(_ProjectingConstraint):
return _directionConsine(self.wrkpln,self.l1,self.l2,self.supplement) return _directionConsine(self.wrkpln,self.l1,self.l2,self.supplement)
def getEq(self): def getEq(self):
return self.Angle - sp.cos(self.degree.SymObj*sp.pi/180.0) return self.DirectionCosine - sp.cos(self.degree.SymObj*sp.pi/180.0)
class _Perpendicular(_Angle): class _Perpendicular(_Angle):
_args = ('l1', 'l2',) _args = ('l1', 'l2',)