kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Some depth calculation fixes

Browse Source
This commit is contained in:
Patrick Felixberger
2020-03-11 23:51:15 +01:00
parent 639327d62c
commit 6fca59c388
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Path/PathScripts/PathPocketShape.py
View File

@@ -41,7 +41,7 @@ __author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org" __url__ = "http://www.freecadweb.org"
__doc__ = "Class and implementation of shape based Pocket operation." __doc__ = "Class and implementation of shape based Pocket operation."
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule()) PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule())
# PathLog.trackModule(PathLog.thisModule()) # PathLog.trackModule(PathLog.thisModule())
# Qt translation handling # Qt translation handling
@@ -473,7 +473,9 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
PathLog.info(translate("Path", "Consider toggling the InverseAngle property and recomputing the operation.")) PathLog.info(translate("Path", "Consider toggling the InverseAngle property and recomputing the operation."))
else: else:
PathLog.debug("Face appears to be oriented correctly.") PathLog.debug("Face appears to be oriented correctly.")
if angle < -180:
angle += 360
tup = clnBase, [sub], angle, axis, clnStock tup = clnBase, [sub], angle, axis, clnStock
else: else:
if self.warnDisabledAxis(obj, axis) is False: if self.warnDisabledAxis(obj, axis) is False:
@@ -485,6 +487,7 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
# Eif # Eif
allTuples.append(tup) allTuples.append(tup)
baseSubsTuples.append(tup) baseSubsTuples.append(tup)
else: else:
ignoreSub = base.Name + '.' + sub ignoreSub = base.Name + '.' + sub
PathLog.error(translate('Path', "Selected feature is not a Face. Ignoring: {}".format(ignoreSub))) PathLog.error(translate('Path', "Selected feature is not a Face. Ignoring: {}".format(ignoreSub)))
@@ -546,12 +549,12 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
for f in self.horiz: for f in self.horiz:
if obj.EnableRotation == 'Off': if obj.EnableRotation == 'Off':
finDep = obj.FinalDepth.Value # max(obj.FinalDepth.Value, f.BoundBox.ZMin) finDep = obj.FinalDepth.Value # max(obj.FinalDepth.Value, f.BoundBox.ZMin)
#print("NO_ROT: ObjDep: {}, FinDep: {}, BBmin: {}".format(obj.FinalDepth.Value, finDep, f.BoundBox.ZMin)) print("NO_ROT: ObjDep: {}, FinDep: {}, BBmin: {}".format(obj.FinalDepth.Value, finDep, f.BoundBox.ZMin))
f.translate(FreeCAD.Vector(0, 0, finDep-f.BoundBox.ZMin)) f.translate(FreeCAD.Vector(0, 0, finDep-f.BoundBox.ZMin))
else: else:
finDep = max(obj.FinalDepth.Value, f.BoundBox.ZMin) finDep = f.BoundBox.ZMin
#print("ROT: ObjDep: {}, FinDep: {}, BBmin: {}".format(obj.FinalDepth.Value, finDep, f.BoundBox.ZMin)) print("ROT: ObjDep: {}, FinDep: {}, BBmin: {}".format(obj.FinalDepth.Value, finDep, f.BoundBox.ZMin))
f.translate(FreeCAD.Vector(0, 0, finDep)) f.translate(FreeCAD.Vector(0, 0, 0))
obj.FinalDepth.Value = finDep obj.FinalDepth.Value = finDep
# check all faces and see if they are touching/overlapping and combine those into a compound # check all faces and see if they are touching/overlapping and combine those into a compound
@@ -563,6 +566,7 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
wire = TechDraw.findShapeOutline(shape, 1, FreeCAD.Vector(0, 0, 1)) wire = TechDraw.findShapeOutline(shape, 1, FreeCAD.Vector(0, 0, 1))
wire.translate(FreeCAD.Vector(0, 0, obj.FinalDepth.Value - wire.BoundBox.ZMin)) wire.translate(FreeCAD.Vector(0, 0, obj.FinalDepth.Value - wire.BoundBox.ZMin))
self.horizontal.append(Part.Face(wire)) self.horizontal.append(Part.Face(wire))
print("2: FinDep: {}, WireBB: {}, Sub: {}".format(obj.FinalDepth.Value, wire.BoundBox.ZMin, obj.FinalDepth.Value - wire.BoundBox.ZMin))
else: else:
self.horizontal.append(shape) self.horizontal.append(shape)