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

assembly: fix part group migration error

Browse Source 
Fixes #252
This commit is contained in:
Zheng, Lei 2019-07-03 13:22:05 +08:00
parent c927d00b4d
commit 4a467bf670
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assembly.py
View File

@ -399,7 +399,7 @@ class ViewProviderAsmPartGroup(ViewProviderAsmGroup):
def showParts(self): def showParts(self):
vobj = self.ViewObject vobj = self.ViewObject
obj = vobj.Object obj = vobj.Object
if not hasattr(obj,'Shape'): if not obj.isDerivedFrom('Part::FeaturePython'):
return return
assembly = obj.Proxy.getAssembly().Object assembly = obj.Proxy.getAssembly().Object
if not assembly.ViewObject.ShowParts and \ if not assembly.ViewObject.ShowParts and \
@ -585,7 +585,7 @@ class AsmElement(AsmBase):
Assembly.autoSolve(obj,prop) Assembly.autoSolve(obj,prop)
def execute(self,obj): def execute(self,obj):
if not hasattr(obj,'Shape'): if not obj.isDerivedFrom('Part::FeaturePython'):
self.version.value += 1 self.version.value += 1
return False return False
@ -640,11 +640,11 @@ class AsmElement(AsmBase):
if not shape: if not shape:
# If the shape is not given, we simply obtain the shape inside our # If the shape is not given, we simply obtain the shape inside our
# own "Shape" property # own "Shape" property
shape = getattr(obj,'Shape') shape = obj.Shape
if not shape or shape.isNull(): if not shape or shape.isNull():
return return
# De-compound to obtain the original shape in our coordinate system # De-compound to obtain the original shape in our coordinate system
shape = obj.Shape.SubShapes[0] shape = shape.SubShapes[0]
# Call getElementInfo() to obtain part's placement only. We don't # Call getElementInfo() to obtain part's placement only. We don't
# need the shape here, in order to handle even with missing # need the shape here, in order to handle even with missing
@ -3349,7 +3349,7 @@ class Assembly(AsmGroup):
def upgrade(self): def upgrade(self):
'Upgrade old assembly objects to the new version' 'Upgrade old assembly objects to the new version'
partGroup = self.getPartGroup() partGroup = self.getPartGroup()
if hasattr(partGroup,'Shape'): if partGroup.isDerivedFrom('Part::FeaturePython'):
return return
partGroup.setPropertyStatus('GroupMode','-Immutable') partGroup.setPropertyStatus('GroupMode','-Immutable')
partGroup.GroupMode = 0 # prevent auto delete children partGroup.GroupMode = 0 # prevent auto delete children
@ -3396,8 +3396,10 @@ class Assembly(AsmGroup):
partGroup = self.getPartGroup() partGroup = self.getPartGroup()
if not obj.Freeze and obj.BuildShape==BuildShapeNone: if not obj.Freeze and obj.BuildShape==BuildShapeNone:
obj.Shape = Part.Shape(); obj.Shape = Part.Shape();
if hasattr(partGroup, 'Shape'): try:
partGroup.Shape = Part.Shape() partGroup.Shape = Part.Shape()
except Exception:
pass
return return
group = flattenGroup(partGroup) group = flattenGroup(partGroup)
@ -3442,12 +3444,14 @@ class Assembly(AsmGroup):
else: else:
shape = Part.makeCompound(shapes) shape = Part.makeCompound(shapes)
if hasattr(partGroup,'Shape'): try:
if obj.Freeze or obj.BuildShape!=BuildShapeCompound: if obj.Freeze or obj.BuildShape!=BuildShapeCompound:
partGroup.Shape = shape partGroup.Shape = shape
shape.Tag = partGroup.ID shape.Tag = partGroup.ID
else: else:
partGroup.Shape = Part.Shape() partGroup.Shape = Part.Shape()
except Exception:
pass
shape.Placement = obj.Placement shape.Placement = obj.Placement
obj.Shape = shape obj.Shape = shape
@ -3505,7 +3509,7 @@ class Assembly(AsmGroup):
for link in flattenGroup(cstr): for link in flattenGroup(cstr):
link.Proxy.migrate(link) link.Proxy.migrate(link)
if self.frozen or hasattr(partGroup,'Shape'): if self.frozen or partGroup.isDerivedFrom('Part::FeaturePython'):
shape = Part.Shape(partGroup.Shape) shape = Part.Shape(partGroup.Shape)
shape.Placement = obj.Placement shape.Placement = obj.Placement
shape.Tag = obj.ID shape.Tag = obj.ID