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

constraint: support cylindrical face in MultiParallel

Browse Source
This commit is contained in:
Zheng, Lei 2020-10-26 20:37:34 +08:00
parent 4edc0fbca6
commit 9f4fa40b8f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freecad/asm3/assembly.py
View File

@ -689,7 +689,9 @@ class AsmElement(AsmBase):
info = None info = None
try: try:
info = self.getInfo(False) info = self.getInfo(False)
except Exception: except Exception as e:
logger.warn(str(e))
self.updatePlacement() self.updatePlacement()
if not gui.AsmCmdManager.AutoFixElement: if not gui.AsmCmdManager.AutoFixElement:

8
freecad/asm3/constraint.py
View File

@ -245,11 +245,15 @@ def _lw(solver,partInfo,subname,shape,retAll=False):
'return a handle for either a line or a plane depending on the shape' 'return a handle for either a line or a plane depending on the shape'
_ = retAll _ = retAll
if not solver: if not solver:
if utils.isLinearEdge(shape) or utils.isPlanar(shape): if utils.isLinearEdge(shape) or \
utils.isPlanar(shape) or \
utils.isCylindricalPlane(shape):
return return
return 'a linear edge or edge/face with planar surface' return 'a linear edge or edge/face with planar or cylindrical surface'
if utils.isLinearEdge(shape): if utils.isLinearEdge(shape):
return _l(solver,partInfo,subname,shape,False) return _l(solver,partInfo,subname,shape,False)
if utils.isCylindricalPlane(shape):
return _n(solver,partInfo,subname,shape,False)
return _wa(solver,partInfo,subname,shape) return _wa(solver,partInfo,subname,shape)
def _w(solver,partInfo,subname,shape,retAll=False,noCheck=False): def _w(solver,partInfo,subname,shape,retAll=False,noCheck=False):