Consolidated base model naming

This commit is contained in:
Markus Lampert
2018-08-31 19:48:35 -07:00
committed by wmayer
parent f01eb07375
commit cd4e3043e5
2 changed files with 3 additions and 3 deletions

View File

@@ -98,7 +98,7 @@ class ObjectContour(PathProfileBase.ObjectProfile):
return [(f.extrude(FreeCAD.Vector(0, 0, thickness)), False)]
if not isPanel:
return [(PathUtils.getEnvelope(partshape=model.Shape, subshape=None, depthparams=self.depthparams), False) for model in self.model if hasattr(model, 'Shape')]
return [(PathUtils.getEnvelope(partshape=base.Shape, subshape=None, depthparams=self.depthparams), False) for base in self.base if hasattr(base, 'Shape')]
def areaOpAreaParams(self, obj, isHole):
params = self.baseObject().areaOpAreaParams(obj, isHole)

View File

@@ -96,8 +96,8 @@ class ObjectProfile(PathProfileBase.ObjectProfile):
zShift = b[0].Shape.BoundBox.ZMin - f.BoundBox.ZMin
newPlace = FreeCAD.Placement(FreeCAD.Vector(0, 0, zShift), f.Placement.Rotation)
f.Placement = newPlace
for model in self.model:
env = PathUtils.getEnvelope(model.Shape, subshape=f, depthparams=self.depthparams)
for base in self.model:
env = PathUtils.getEnvelope(base.Shape, subshape=f, depthparams=self.depthparams)
shapes.append((env, False))
return shapes