Commit 9db130d8 authored by sumpfralle's avatar sumpfralle

ContourFollow should use SimpleCutter instead of PathAccumulator (since it is...

ContourFollow should use SimpleCutter instead of PathAccumulator (since it is a slice based algorithm)


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@717 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent ff788275
...@@ -2326,7 +2326,7 @@ class ProjectGui: ...@@ -2326,7 +2326,7 @@ class ProjectGui:
if strategy == "ContourPolygonStrategy": if strategy == "ContourPolygonStrategy":
processor = "ContourCutter" processor = "ContourCutter"
else: else:
processor = "PathAccumulator" processor = "SimpleCutter"
reverse = milling_style in ("climb", "ignore") reverse = milling_style in ("climb", "ignore")
elif strategy == "EngraveStrategy": elif strategy == "EngraveStrategy":
processor = "SimpleCutter" processor = "SimpleCutter"
......
...@@ -351,20 +351,18 @@ def _get_pathgenerator_instance(trimesh_model, contour_model, cutter, ...@@ -351,20 +351,18 @@ def _get_pathgenerator_instance(trimesh_model, contour_model, cutter,
processor = pycam.PathProcessors.SimpleCutter(reverse=reverse) processor = pycam.PathProcessors.SimpleCutter(reverse=reverse)
else: else:
return ("Invalid postprocessor (%s) for 'EngraveCutter' - it " \ return ("Invalid postprocessor (%s) for 'EngraveCutter' - it " \
+ "should be one of these: %s") \ + "should be: SimpleCutter") % str(processor)
% (processor, PATH_POSTPROCESSORS)
if not contour_model: if not contour_model:
return "The EngraveCutter requires a contour model (e.g. from a " \ return "The EngraveCutter requires a contour model (e.g. from a " \
+ "DXF file)." + "DXF file)."
return EngraveCutter.EngraveCutter(cutter, trimesh_model, return EngraveCutter.EngraveCutter(cutter, trimesh_model,
contour_model, processor, physics=physics) contour_model, processor, physics=physics)
elif pathgenerator == "ContourFollow": elif pathgenerator == "ContourFollow":
if pathprocessor == "PathAccumulator": if pathprocessor == "SimpleCutter":
processor = pycam.PathProcessors.PathAccumulator(reverse=reverse) processor = pycam.PathProcessors.SimpleCutter(reverse=reverse)
else: else:
return ("Invalid postprocessor (%s) for 'ContourFollow' - it " \ return ("Invalid postprocessor (%s) for 'ContourFollow' - it " \
+ "should be one of these: %s") \ + "should be: SimpleCutter") % str(processor)
% (processor, PATH_POSTPROCESSORS)
return ContourFollow.ContourFollow(cutter, trimesh_model, processor, return ContourFollow.ContourFollow(cutter, trimesh_model, processor,
physics=physics) physics=physics)
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment