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

Path: PathSurface task panel update

Browse Source
This commit is contained in:
pekkaroi
2018-09-25 20:55:07 +03:00
committed by Yorik van Havre
parent 5118118740
commit 2f2f5af4c2
3 changed files with 234 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Path/PathScripts/PathSurface.py
View File

@@ -76,6 +76,7 @@ class ObjectSurface(PathOp.ObjectOp):
obj.addProperty("App::PropertyPercent", "StepOver", "Surface", QtCore.QT_TRANSLATE_NOOP("App::Property", "Step over percentage of the drop cutter path"))
obj.addProperty("App::PropertyDistance", "DepthOffset", "Surface", QtCore.QT_TRANSLATE_NOOP("App::Property", "Z-axis offset from the surface of the object"))
obj.addProperty("App::PropertyFloatConstraint", "SampleInterval", "Surface", QtCore.QT_TRANSLATE_NOOP("App::Property", "The Sample Interval. Small values cause long wait times"))
obj.addProperty("App::PropertyBool", "Optimize", "Surface", QtCore.QT_TRANSLATE_NOOP("App::Property", "Enable optimization which removes unecessary points from G-Code output"))
obj.BoundBox = ['Stock', 'BaseBoundBox']
obj.DropCutterDir = ['X', 'Y']
obj.Algorithm = ['OCL Dropcutter', 'OCL Waterline']
@@ -179,9 +180,22 @@ class ObjectSurface(PathOp.ObjectOp):
pp.append(Path.Command('G0', {"Z": obj.SafeHeight.Value, 'F': self.vertRapid}))
pp.append(Path.Command('G0', {'X': p.x, "Y": p.y, 'F': self.horizRapid}))
pp.append(Path.Command('G1', {"Z": p.z, 'F': self.vertFeed}))
for p in loop[1:]:
pp.append(Path.Command('G1', {'X': p.x, "Y": p.y, "Z": p.z, 'F': self.horizFeed}))
prev = ocl.Point(float("inf"), float("inf"), float("inf"))
next = ocl.Point(float("inf"), float("inf"), float("inf"))
optimize = obj.Optimize
for i in range(1, len(loop)):
p = loop[i]
if i < len(loop) - 1:
next.x = loop[i + 1].x
next.y = loop[i + 1].y
next.z = loop[i + 1].z
else:
optimize = False
if not optimize or not self.isPointOnLine(FreeCAD.Vector(prev.x, prev.y, prev.z), FreeCAD.Vector(next.x, next.y, next.z), FreeCAD.Vector(p.x, p.y, p.z)):
pp.append(Path.Command('G1', {'X': p.x, "Y": p.y, "Z": p.z, 'F': self.horizFeed}))
prev.x = p.x
prev.y = p.y
prev.z = p.z
# zheight = p.z
p = loop[0]
pp.append(Path.Command('G1', {'X': p.x, "Y": p.y, "Z": p.z, 'F': self.horizFeed}))
@@ -194,7 +208,7 @@ class ObjectSurface(PathOp.ObjectOp):
return pp
depthparams = PathUtils.depth_params(obj.ClearanceHeight.Value, obj.SafeHeight.Value,
obj.StartDepth.Value, obj.StepDown, obj.FinishDepth.Value, obj.FinalDepth.Value)
obj.StartDepth.Value, obj.StepDown, 0.0, obj.FinalDepth.Value)
t_before = time.time()
zheights = [i for i in depthparams]
@@ -321,7 +335,7 @@ class ObjectSurface(PathOp.ObjectOp):
output.append(Path.Command('G1', {'Z': clp[0].z, 'F': self.vertFeed}))
prev = ocl.Point(float("inf"), float("inf"), float("inf"))
next = ocl.Point(float("inf"), float("inf"), float("inf"))
optimize = True
optimize = obj.Optimize
for i in range(0, len(clp)):
c = clp[i]
if i < len(clp) - 1:
@@ -347,6 +361,7 @@ class ObjectSurface(PathOp.ObjectOp):
# obj.ZigZagAngle = 45.0
obj.StepOver = 50
obj.Optimize = True
# need to overwrite the default depth calculations for facing
job = PathUtils.findParentJob(obj)
if job and job.Stock: