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

system: change auto relax behavior

Browse Source 
New property is added to Assembly container named 'AutoRelax' to let
user decide. It is by default off. PlaneCoincident auto relax will be
always on regardless of this setting.
This commit is contained in:
Zheng, Lei 2018-03-31 07:56:41 +08:00
parent 6b98f8c7b6
commit b5489b8a9b
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
system.py
View File

@ -56,7 +56,10 @@ class System(ProxyType):
def getSystem(mcs,obj): def getSystem(mcs,obj):
proxy = mcs.getProxy(obj) proxy = mcs.getProxy(obj)
if proxy: if proxy:
return proxy.getSystem(obj) system = proxy.getSystem(obj)
if isinstance(system,SystemExtension):
system.relax = obj.AutoRelax
return system
@classmethod @classmethod
def isConstraintSupported(mcs,obj,name): def isConstraintSupported(mcs,obj,name):
@ -66,15 +69,16 @@ class System(ProxyType):
if proxy: if proxy:
return proxy.isConstraintSupported(name) return proxy.isConstraintSupported(name)
def _makePropInfo(name,tp,doc=''): def _makePropInfo(name,tp,doc='',default=None):
PropertyInfo(System,name,tp,doc,group='Solver') PropertyInfo(System,name,tp,doc,group='Solver',default=default)
_makePropInfo('Verbose','App::PropertyBool') _makePropInfo('Verbose','App::PropertyBool')
_makePropInfo('AutoRelax','App::PropertyBool')
class SystemBase(object): class SystemBase(object):
__metaclass__ = System __metaclass__ = System
_id = 0 _id = 0
_props = ['Verbose'] _props = ['Verbose','AutoRelax']
def __init__(self,obj): def __init__(self,obj):
self._touched = True self._touched = True
@ -116,6 +120,7 @@ class SystemExtension(object):
self.cstrObj = None self.cstrObj = None
self.firstInfo = None self.firstInfo = None
self.secondInfo = None self.secondInfo = None
self.relax = False
def checkRedundancy(self,obj,firstInfo,secondInfo): def checkRedundancy(self,obj,firstInfo,secondInfo):
self.cstrObj,self.firstInfo,self.secondInfo=obj,firstInfo,secondInfo self.cstrObj,self.firstInfo,self.secondInfo=obj,firstInfo,secondInfo
@ -158,7 +163,7 @@ class SystemExtension(object):
if increment: if increment:
cstrs += [None]*increment cstrs += [None]*increment
ret += len(cstrs) ret += len(cstrs)
if ret >= count: if count and ret >= count:
if ret>count: if ret>count:
self.reportRedundancy(True) self.reportRedundancy(True)
return -1 return -1
@ -174,11 +179,6 @@ class SystemExtension(object):
n1,nx1 = n1[:2] n1,nx1 = n1[:2]
n2,nx2 = n2[:2] n2,nx2 = n2[:2]
h = [] h = []
count = self.countConstraints(0,1,'Alignment','Axial')
if count<0:
# We do not allow plane coincident coexist with other composite
# constraints
return
count = self.countConstraints(2 if lockAngle else 1,2,'Coincident') count = self.countConstraints(2 if lockAngle else 1,2,'Coincident')
if count<0: if count<0:
return return
@ -212,34 +212,32 @@ class SystemExtension(object):
w1,_,n1 = e1[:4] w1,_,n1 = e1[:4]
_,p2,n2 = e2[:4] _,p2,n2 = e2[:4]
n1,nx1 = n1[:2] n1,nx1 = n1[:2]
n2,nx2,px2 = n2[:3] n2,nx2 = n2[:2]
h = [] h = []
count = self.countConstraints(0,1,'Coincident','Axial') if self.relax:
if count<0:
return
count = self.countConstraints(2 if lockAngle else 1,3,'Alignment') count = self.countConstraints(2 if lockAngle else 1,3,'Alignment')
if count<0: if count<0:
return return
else:
count = 0
if d: if d:
h.append(self.addPointPlaneDistance(d,p2,w1,group=group)) h.append(self.addPointPlaneDistance(d,p2,w1,group=group))
else: else:
h.append(self.addPointInPlane(p2,w1,group=group)) h.append(self.addPointInPlane(p2,w1,group=group))
if count==1 or (lockAngle and count==2): if count<=2:
h.append(self.setOrientation(h,lockAngle,angle,n1,n2,nx1,nx2,group)) if count==2 and not lockAngle:
elif count==2:
self.reportRedundancy() self.reportRedundancy()
if d: h.append(self.setOrientation(h,lockAngle,angle,n1,n2,nx1,nx2,group))
h.append(self.addPointPlaneDistance(d,px2,w1,group=group))
else:
h.append(self.addPointInPlane(px2,w1,group=group))
return h return h
def addAxialAlignment(self,lockAngle,angle,e1,e2,group=0): def addAxialAlignment(self,lockAngle,angle,e1,e2,group=0):
if not group: if not group:
group = self.GroupHandle group = self.GroupHandle
count = self.countConstraints(0,1,'Coincident','Alignment') count = self.countConstraints(0,2,'Coincident')
if count<0: if count<0:
return return
if count:
return self.addPlaneCoincident(False,0,e1,e2,group)
w1,p1,n1 = e1[:3] w1,p1,n1 = e1[:3]
_,p2,n2 = e2[:3] _,p2,n2 = e2[:3]
n1,nx1 = n1[:2] n1,nx1 = n1[:2]