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

utils: improve handling of App::Placement

Browse Source
This commit is contained in:
Zheng, Lei 2019-05-09 20:11:21 +08:00
parent 134889c69c
commit e4a8423fa1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assembly.py
View File

@ -661,9 +661,11 @@ class AsmElement(AsmBase):
def getSubName(self): def getSubName(self):
link = self.Object.LinkedObject link = self.Object.LinkedObject
if not isinstance(link,tuple): if not link:
raise RuntimeError('Invalid element link "{}"'.format( raise RuntimeError('Invalid element link "{}"'.format(
objName(self.Object))) objName(self.Object)))
if not isinstance(link,tuple):
return link.Name + '.'
return link[0].Name + '.' + link[1] return link[0].Name + '.' + link[1]
def getElementSubname(self,recursive=False): def getElementSubname(self,recursive=False):

21
utils.py
View File

@ -91,7 +91,8 @@ def getElementShape(obj,tp=None,transform=False,noElementMap=True):
if not isinstance(obj,(tuple,list)): if not isinstance(obj,(tuple,list)):
shape = obj shape = obj
else: else:
shape,mat,sobj = Part.getShape(obj[0],subname=obj[1], sub = obj[1]
shape,mat,sobj = Part.getShape(obj[0],subname=sub,
needSubElement=True,retType=2, needSubElement=True,retType=2,
transform=transform,noElementMap=noElementMap) transform=transform,noElementMap=noElementMap)
if not sobj: if not sobj:
@ -105,7 +106,6 @@ def getElementShape(obj,tp=None,transform=False,noElementMap=True):
shape = Part.makeLine(FreeCAD.Vector(-size,0,0), shape = Part.makeLine(FreeCAD.Vector(-size,0,0),
FreeCAD.Vector(size,0,0)) FreeCAD.Vector(size,0,0))
shape.transformShape(mat,False,True) shape.transformShape(mat,False,True)
return shape
elif sobj.isDerivedFrom('App::Plane'): elif sobj.isDerivedFrom('App::Plane'):
if tp not in (None, Part.Shape, Part.Face): if tp not in (None, Part.Shape, Part.Face):
logger.trace('wrong type of shape {}',obj) logger.trace('wrong type of shape {}',obj)
@ -114,7 +114,18 @@ def getElementShape(obj,tp=None,transform=False,noElementMap=True):
shape = Part.makePlane(size*2,size*2, shape = Part.makePlane(size*2,size*2,
FreeCAD.Vector(-size,-size,0)) FreeCAD.Vector(-size,-size,0))
shape.transformShape(mat,False,True) shape.transformShape(mat,False,True)
return shape elif sobj.isDerivedFrom('App::Placement'):
sub = sub.split('.')[-1]
dmap = {'':(0,0,1),
'Z-Axis':(0,0,1),
'XY-Plane':(0,0,-1),
'X-Axis':(1,0,0),
'YZ-Plane':(-1,0,0),
'Y-Axis':(0,1,0),
'XZ-Plane':(0,-1,0)}
shape = Part.Face(Part.Plane(
FreeCAD.Vector(),FreeCAD.Vector(*dmap[sub])))
shape.transformShape(mat,False,True)
elif shape.isNull(): elif shape.isNull():
logger.trace('no shape {}',obj) logger.trace('no shape {}',obj)
return return
@ -172,10 +183,10 @@ def isElement(obj):
if not sobj: if not sobj:
return return
if not shape: if not shape:
return sobj.TypeId in ('App::Line','App::Plane') return sobj.TypeId in ('App::Line','App::Plane','App::Placement')
if isinstance(obj,(Part.Vertex,Part.Face,Part.Edge)): if isinstance(obj,(Part.Vertex,Part.Face,Part.Edge)):
return True return True
if isinstance(shape,Part.Shape) and not shape.isNull(): if isinstance(shape,Part.Shape):
return shape.countElement('Vertex')==1 or \ return shape.countElement('Vertex')==1 or \
shape.countElement('Edge')==1 or \ shape.countElement('Edge')==1 or \
shape.countElement('Face')==1 shape.countElement('Face')==1