From a685320bc3991f13b3ae32225a4c78ab63c68c2b Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Tue, 13 Feb 2018 06:39:37 +0800 Subject: [PATCH] system: improve plane coincident/alignment offset --- system.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/system.py b/system.py index dbd4a1f..26490ae 100644 --- a/system.py +++ b/system.py @@ -130,12 +130,14 @@ class SystemExtension(object): def addPlaneCoincident(self,d,lockAngle,angle,e1,e2,group=0): if not group: group = self.GroupHandle - d = abs(d) - _,p1,n1,nx1 = e1 + w1,p1,n1,nx1 = e1 w2,p2,n2,nx2 = e2 h = [] - if d>0.0: - h.append(self.addPointPlaneDistance(d,p1,w2,group=group)) + if d: + 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)) else: 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): if not group: group = self.GroupHandle - d = abs(d) - _,p1,n1,nx1 = e1 - w2,_,n2,nx2 = e2 + w1,p1,n1,nx1 = e1 + w2,p2,n2,nx2 = e2 h = [] if d>0.0: h.append(self.addPointPlaneDistance(d,p1,w2,group=group)) + elif d<0.0: + h.append(self.addPointPlaneDistance(d,p2,w1,group=group)) else: h.append(self.addPointInPlane(p1,w2,group=group)) return self.setOrientation(h,lockAngle,angle,n1,n2,nx1,nx2,group)