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

system: improve plane coincident/alignment offset

Browse Source
This commit is contained in:
Zheng, Lei 2018-02-13 06:39:37 +08:00
parent 0e7e94941a
commit a685320bc3
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system.py
View File

@ -130,12 +130,14 @@ class SystemExtension(object):
def addPlaneCoincident(self,d,lockAngle,angle,e1,e2,group=0): def addPlaneCoincident(self,d,lockAngle,angle,e1,e2,group=0):
if not group: if not group:
group = self.GroupHandle group = self.GroupHandle
d = abs(d) w1,p1,n1,nx1 = e1
_,p1,n1,nx1 = e1
w2,p2,n2,nx2 = e2 w2,p2,n2,nx2 = e2
h = [] h = []
if d>0.0: if d:
h.append(self.addPointPlaneDistance(d,p1,w2,group=group)) if d>0.0:
h.append(self.addPointPlaneDistance(d,p1,w2,group=group))
else:
h.append(self.addPointPlaneDistance(d,p2,w1,group=group))
h.append(self.addPointsCoincident(p1,p2,w2,group=group)) h.append(self.addPointsCoincident(p1,p2,w2,group=group))
else: else:
h.append(self.addPointsCoincident(p1,p2,group=group)) h.append(self.addPointsCoincident(p1,p2,group=group))
@ -144,12 +146,13 @@ class SystemExtension(object):
def addPlaneAlignment(self,d,lockAngle,angle,e1,e2,group=0): def addPlaneAlignment(self,d,lockAngle,angle,e1,e2,group=0):
if not group: if not group:
group = self.GroupHandle group = self.GroupHandle
d = abs(d) w1,p1,n1,nx1 = e1
_,p1,n1,nx1 = e1 w2,p2,n2,nx2 = e2
w2,_,n2,nx2 = e2
h = [] h = []
if d>0.0: if d>0.0:
h.append(self.addPointPlaneDistance(d,p1,w2,group=group)) h.append(self.addPointPlaneDistance(d,p1,w2,group=group))
elif d<0.0:
h.append(self.addPointPlaneDistance(d,p2,w1,group=group))
else: else:
h.append(self.addPointInPlane(p1,w2,group=group)) h.append(self.addPointInPlane(p1,w2,group=group))
return self.setOrientation(h,lockAngle,angle,n1,n2,nx1,nx2,group) return self.setOrientation(h,lockAngle,angle,n1,n2,nx1,nx2,group)