svg2gcode 3.3.5__tar.gz → 3.3.6__tar.gz

{svg2gcode-3.3.5 → svg2gcode-3.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg2gcode
-Version: 3.3.5
+Version: 3.3.6
 Summary: svg2gcode: convert an SVG (Scalable Vector Graphic) image to gcode.
 Keywords: scalable vector graphics,svg,image,laser cutter,laser engraving
 Author-email: Johannes Noordanus <mailjohannes.mailnoordanus@gmail.com>

{svg2gcode-3.3.5 → svg2gcode-3.3.6}/svg2gcode/__init__.py

@@ -1,4 +1,4 @@
 """
 svg2gcode: convert an SVG (Scalable Vector Graphic) image to gcode.
 """
-__version__ = "3.3.5"
+__version__ = "3.3.6"

{svg2gcode-3.3.5 → svg2gcode-3.3.6}/svg2gcode/svg_to_gcode/compiler/_compiler.py

@@ -19,7 +19,7 @@ from svg2gcode.svg_to_gcode import DEFAULT_SETTING
 from svg2gcode.svg_to_gcode import TOLERANCES, SETTING, check_setting
 
 from svg2gcode.svg_to_gcode import css_color
-from svg2gcode.svg_to_gcode.svg_parser import NAMESPACES, ElementTree_MY_PARENT
+from svg2gcode.svg_to_gcode.svg_parser import NAMESPACES, ElementTreeParent
 
 from svg2gcode import __version__
 
@@ -483,13 +483,13 @@ class Compiler:
             style['pathcut'] = curve.path_attrib['gcode_pathcut']
 
         # check missing attributes, if any
-        if ElementTree_MY_PARENT in curve.path_attrib:
-            parent = curve.path_attrib[ElementTree_MY_PARENT]
+        if ElementTreeParent in curve.path_attrib:
+            parent = curve.path_attrib[ElementTreeParent]
 
-            # find first parent g (group) tag, if any
+            # find first parent <g (group) tag, if any
             while parent and parent.tag != "{%s}g" % NAMESPACES["svg"]:
-                if ElementTree_MY_PARENT in parent.attrib:
-                    parent = parent.attrib[ElementTree_MY_PARENT]
+                if ElementTreeParent in parent.attrib:
+                    parent = parent.attrib[ElementTreeParent]
                 else:
                     parent = None
             if parent:
@@ -671,7 +671,7 @@ class Compiler:
         def get_style_info_of_line_chain(line_chain: LineSegmentChain) -> ():
             """
             Get style info of line_chain.
-            Returns tuple (stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule)
+            Returns tuple (stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule, pathcut)
             """
             # defaults
             stroke_width = 0
@@ -685,8 +685,7 @@ class Compiler:
             first_line_of_chain = line_chain.get(0)
             style = self.parse_style_attribute(first_line_of_chain)
             if style:
-                if not (style['pathcut'] == 'true' or self.settings["pathcut"]) \
-                    and style['stroke'] is not None and style['stroke'] != "none":
+                if style['stroke'] is not None and style['stroke'] != "none":
                     stroke_color = style['stroke']
                     if style['stroke-opacity'] is not None:
                         # fill opacity attribute overrides rgba property
@@ -721,7 +720,7 @@ class Compiler:
                             fill_alpha = rgba[3]
                     fill_color = round(fill_color * fill_alpha)
 
-            return (stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule)
+            return (stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule, style['pathcut'])
 
 
         path_curves = {}
@@ -776,9 +775,13 @@ class Compiler:
             # Render svg 'stroke' attribute
             for line_chain in path_curves[name_id]:
                 # get style info
-                stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule = get_style_info_of_line_chain(line_chain)
+                stroke_width, stroke_color, stroke_alpha, fill_color, fill_alpha, fill_rule, style_pathcut = get_style_info_of_line_chain(line_chain)
 
-                if len(stroke_color):
+                if (style_pathcut is not None and style_pathcut == 'true') or self.settings["pathcut"]:
+                    # cut path
+                    self.body.extend([f"\n; cut path (pathcut set) '{name_id}'"])
+                    render_pathwidth(line_chain, [0], None, None, boundingbox)
+                elif len(stroke_color):
 
                     # Get stroke alpha channel (opacity)
                     # fill opacity attribute overrides rgba property
@@ -840,13 +843,12 @@ class Compiler:
                                     if not (delta == stroke_width and stroke_width % 2 != 0):
                                         steps.append(round(-delta * pixel_size, self.precision))
 
-                        # color_coded isn't set: with path color engrave path
-                        self.body.extend([f"\n; engrave path '{name_id}', color '{stroke_color}'"])
+                        # color_coded isn't set: engrave path with stroke color
+                        self.body.extend([f"\n; default action: engrave path '{name_id}', color '{stroke_color}'"])
                         render_pathwidth(line_chain, steps, inverse_bw, speed, boundingbox)
                 else:
-                    # line stroke isn't set: ignore path
-                    self.body.extend([f"\n; no stroke color set: ignore path '{name_id}'"])
-                    #render_pathwidth(line_chain, [0], None, None, boundingbox)
+                    # cannot engrave path (ignore)
+                    self.body.extend([f"\n; cannot engrave path (ignore) no stroke color set: path '{name_id}'"])
 
             # Render svg 'fill' attribute
             #if not self.settings["nofill"] and fill_color is not None and boundingbox.get() is not None: