fixed the conventional/climb mode for engravings (wrong order of polygons was applied before)

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@884 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Geometry/Model.py

@@ -433,6 +433,12 @@ class ContourModel(BaseModel):
                 return None
         self.reset_cache()
 
+    def get_reversed(self):
+        result = ContourModel(plane=self._plane)
+        for poly in self.get_polygons():
+            result.append(poly.get_reversed())
+        return result
+
     def get_cropped_model(self, minx, maxx, miny, maxy, minz, maxz):
         new_line_groups = []
         for group in self._line_groups:

src/pycam/Geometry/Polygon.py

@@ -104,6 +104,12 @@ class Polygon(TransformableContainer):
         self._points.reverse()
         self.reset_cache()
 
+    def get_reversed(self):
+        result = Polygon(plane=self.plane)
+        result._points = self._points[:]
+        result.reverse_direction()
+        return result
+
     def is_connectable(self, line):
         if self.is_closed:
             return False

src/pycam/PathGenerators/EngraveCutter.py

@@ -36,7 +36,7 @@ log = pycam.Utils.log.get_logger()
 class EngraveCutter:
 
     def __init__(self, cutter, trimesh_models, contour_model, path_processor,
-            physics=None):
+            clockwise=False, physics=None):
         self.cutter = cutter
         self.models = trimesh_models
         # combine the models (if there is more than one)
@@ -46,6 +46,9 @@ class EngraveCutter:
                 self.combined_model += model
         else:
             self.combined_model = []
+        if clockwise:
+            self.contour_model = contour_model.get_reversed()
+        else:
             self.contour_model = contour_model
         self.pa_push = path_processor
         # We use a separated path processor for the last "drop" layer.

src/pycam/Toolpath/Generator.py

@@ -345,9 +345,9 @@ def _get_pathgenerator_instance(trimesh_models, contour_model, cutter,
         return PushCutter.PushCutter(cutter, trimesh_models, processor,
                 physics=physics)
     elif pathgenerator == "EngraveCutter":
-        reverse = (milling_style == "conventional")
+        clockwise = (milling_style == "climb")
         if pathprocessor == "SimpleCutter":
-            processor = SimpleCutter.SimpleCutter(reverse=reverse)
+            processor = SimpleCutter.SimpleCutter()
         else:
             return ("Invalid postprocessor (%s) for 'EngraveCutter' - it " \
                     + "should be: SimpleCutter") % str(pathprocessor)
@@ -355,7 +355,7 @@ def _get_pathgenerator_instance(trimesh_models, contour_model, cutter,
             return "The 'Engraving' toolpath strategy requires a 2D contour " \
                     + "model (e.g. from a DXF or SVG file)."
         return EngraveCutter.EngraveCutter(cutter, trimesh_models,
-                contour_model, processor, physics=physics)
+                contour_model, processor, clockwise=clockwise, physics=physics)
     elif pathgenerator == "ContourFollow":
         reverse = (milling_style == "conventional")
         if pathprocessor == "SimpleCutter":