svg2gcode 2.3.1__tar.gz → 2.5.0__tar.gz

{svg2gcode-2.3.1 → svg2gcode-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg2gcode
-Version: 2.3.1
+Version: 2.5.0
 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>
@@ -57,11 +57,11 @@ also, program *image2gcode* has similar capabilities but handles raster images f
 See notes below.
 ```
 $ svg2gcode --help
-usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>]
-                 [--cuttingspeed <default:1000>] [--imagepower <default:300>] [--cuttingpower <default:850>]
-                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta]
-                 [--scale Xfactor Yfactor] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>]
-                 [--fan] [-V] svg gcode
+usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>]
+                 [--imagepower <default:300>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>]
+                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta] [--scale Xfactor Yfactor]
+                 [--rotate <default:0>] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
+                 svg gcode
 
 Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.
 
@@ -79,19 +79,21 @@ options:
   --cuttingspeed <default:1000>
                         cutting speed in mm/min
   --imagepower <default:300>
-                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the
-                        machine maximum for a 5W laser)
+                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the machine maximum for a 5W laser)
   --cuttingpower <default:850>
                         sets laser power of line drawings/cutting
+  --passes <default:1>  Number of passes (iterations) for line drawings, only active when pass_depth is set
+  --pass_depth <default:0>
+                        cutting depth in mm for one pass, only active for passes > 1
   --rapidmove <default:10>
-                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm
-                        (default), 0 is no G0 moves
+                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm (default), 0 is no G0 moves
   --noise <default:0>   reduces image noise by not emitting pixels with power lower or equal than this setting
   --constantburn        use constant burn mode M3 (a bit more dangerous!), instead of dynamic burn mode M4
   --origin Xdelta Ydelta
                         translate origin by (Xdelta,Ydelta) (default not set)
   --scale Xfactor Yfactor
                         scale svg with (Xfactor,Yfactor) (default not set)
+  --rotate <default:0>  number of degrees to rotate
   --splitfile           split gcode output of SVG path and image objects
   --xmaxtravel <default:300>
                         machine x-axis lengh in mm

{svg2gcode-2.3.1/svg2gcode → svg2gcode-2.5.0}/README.md

@@ -44,11 +44,11 @@ also, program *image2gcode* has similar capabilities but handles raster images f
 See notes below.
 ```
 $ svg2gcode --help
-usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>]
-                 [--cuttingspeed <default:1000>] [--imagepower <default:300>] [--cuttingpower <default:850>]
-                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta]
-                 [--scale Xfactor Yfactor] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>]
-                 [--fan] [-V] svg gcode
+usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>]
+                 [--imagepower <default:300>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>]
+                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta] [--scale Xfactor Yfactor]
+                 [--rotate <default:0>] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
+                 svg gcode
 
 Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.
 
@@ -66,19 +66,21 @@ options:
   --cuttingspeed <default:1000>
                         cutting speed in mm/min
   --imagepower <default:300>
-                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the
-                        machine maximum for a 5W laser)
+                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the machine maximum for a 5W laser)
   --cuttingpower <default:850>
                         sets laser power of line drawings/cutting
+  --passes <default:1>  Number of passes (iterations) for line drawings, only active when pass_depth is set
+  --pass_depth <default:0>
+                        cutting depth in mm for one pass, only active for passes > 1
   --rapidmove <default:10>
-                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm
-                        (default), 0 is no G0 moves
+                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm (default), 0 is no G0 moves
   --noise <default:0>   reduces image noise by not emitting pixels with power lower or equal than this setting
   --constantburn        use constant burn mode M3 (a bit more dangerous!), instead of dynamic burn mode M4
   --origin Xdelta Ydelta
                         translate origin by (Xdelta,Ydelta) (default not set)
   --scale Xfactor Yfactor
                         scale svg with (Xfactor,Yfactor) (default not set)
+  --rotate <default:0>  number of degrees to rotate
   --splitfile           split gcode output of SVG path and image objects
   --xmaxtravel <default:300>
                         machine x-axis lengh in mm

{svg2gcode-2.3.1 → svg2gcode-2.5.0/svg2gcode}/README.md

@@ -44,11 +44,11 @@ also, program *image2gcode* has similar capabilities but handles raster images f
 See notes below.
 ```
 $ svg2gcode --help
-usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>]
-                 [--cuttingspeed <default:1000>] [--imagepower <default:300>] [--cuttingpower <default:850>]
-                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta]
-                 [--scale Xfactor Yfactor] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>]
-                 [--fan] [-V] svg gcode
+usage: svg2gcode [-h] [--showimage] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>]
+                 [--imagepower <default:300>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>]
+                 [--rapidmove <default:10>] [--noise <default:0>] [--constantburn] [--origin Xdelta Ydelta] [--scale Xfactor Yfactor]
+                 [--rotate <default:0>] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
+                 svg gcode
 
 Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.
 
@@ -66,19 +66,21 @@ options:
   --cuttingspeed <default:1000>
                         cutting speed in mm/min
   --imagepower <default:300>
-                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the
-                        machine maximum for a 5W laser)
+                        maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the machine maximum for a 5W laser)
   --cuttingpower <default:850>
                         sets laser power of line drawings/cutting
+  --passes <default:1>  Number of passes (iterations) for line drawings, only active when pass_depth is set
+  --pass_depth <default:0>
+                        cutting depth in mm for one pass, only active for passes > 1
   --rapidmove <default:10>
-                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm
-                        (default), 0 is no G0 moves
+                        generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm (default), 0 is no G0 moves
   --noise <default:0>   reduces image noise by not emitting pixels with power lower or equal than this setting
   --constantburn        use constant burn mode M3 (a bit more dangerous!), instead of dynamic burn mode M4
   --origin Xdelta Ydelta
                         translate origin by (Xdelta,Ydelta) (default not set)
   --scale Xfactor Yfactor
                         scale svg with (Xfactor,Yfactor) (default not set)
+  --rotate <default:0>  number of degrees to rotate
   --splitfile           split gcode output of SVG path and image objects
   --xmaxtravel <default:300>
                         machine x-axis lengh in mm

{svg2gcode-2.3.1 → svg2gcode-2.5.0}/svg2gcode/__init__.py

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

{svg2gcode-2.3.1 → svg2gcode-2.5.0}/svg2gcode/__main__.py

@@ -24,9 +24,9 @@ def svg2gcode(args) -> int:
         gcode_compiler = Compiler(interfaces.Gcode, params={'laser_power':args.cuttingpower,'movement_speed':args.cuttingspeed, 'pixel_size':args.pixelsize,
                         'maximum_image_laser_power':args.imagepower, 'image_movement_speed':args.imagespeed, 'fan':args.fan,'rapid_move':args.rapidmove,
                         'showimage':args.showimage, 'x_axis_maximum_travel':args.xmaxtravel,'y_axis_maximum_travel':args.ymaxtravel, 'image_noise':args.noise,
-                        'laser_mode':"constant" if args.constantburn else "dynamic", 'splitfile':args.splitfile})
+                        'pass_depth':args.pass_depth, 'laser_mode':"constant" if args.constantburn else "dynamic", 'splitfile':args.splitfile})
         # emit gcode for svg
-        gcode_compiler.compile_to_file(args.gcode, parse_file(args.svg, delta_origin=args.origin, scale_factor=args.scale), passes=1)
+        gcode_compiler.compile_to_file(args.gcode, parse_file(args.svg, delta_origin=args.origin, scale_factor=args.scale, rotate_deg=args.rotate), passes=args.passes)
 
     except Exception as error:
         print(error)
@@ -48,6 +48,9 @@ def main() -> int:
     ymaxtravel_default = 400
     rapidmove_default = 10
     noise_default = 0
+    pass_depth_default = 0
+    passes_default = 1
+    rotate_default = 0
 
     # Define command line argument interface
     parser = argparse.ArgumentParser(description='Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.')
@@ -64,6 +67,10 @@ def main() -> int:
         type=int, help="maximum laser power while drawing an image (as a rule of thumb set to 1/3 of the machine maximum for a 5W laser)")
     parser.add_argument('--cuttingpower', default=cuttingpower_default, metavar="<default:" +str(cuttingpower_default)+ ">",
         type=int, help="sets laser power of line drawings/cutting")
+    parser.add_argument('--passes', default=passes_default, metavar="<default:" +str(passes_default)+ ">",
+        type=int, help="Number of passes (iterations) for line drawings, only active when pass_depth is set")
+    parser.add_argument('--pass_depth', default=pass_depth_default, metavar="<default:" + str(pass_depth_default)+">",
+        type=float, help="cutting depth in mm for one pass, only active for passes > 1")
     parser.add_argument('--rapidmove', default=rapidmove_default, metavar="<default:" +str(rapidmove_default)+ ">",
         type=int, help='generate G0 moves between shapes, for images: G0 moves when skipping more than 10mm (default), 0 is no G0 moves' )
     parser.add_argument('--noise', default=noise_default, metavar="<default:" +str(noise_default)+ ">",
@@ -73,6 +80,8 @@ def main() -> int:
         type=float, help="translate origin by (Xdelta,Ydelta) (default not set)")
     parser.add_argument('--scale', default=None, nargs=2, metavar=('Xfactor', 'Yfactor'),
         type=float, help="scale svg with (Xfactor,Yfactor) (default not set)")
+    parser.add_argument('--rotate', default=rotate_default, metavar="<default:" +str(rotate_default)+ ">",
+        type=int, help="number of degrees to rotate")
     parser.add_argument('--splitfile', action='store_true', default=False, help='split gcode output of SVG path and image objects' )
     parser.add_argument('--xmaxtravel', default=xmaxtravel_default, metavar="<default:" +str(xmaxtravel_default)+ ">",
         type=int, help="machine x-axis lengh in mm")

{svg2gcode-2.3.1 → svg2gcode-2.5.0}/svg2gcode/svg_to_gcode/compiler/_compiler.py

@@ -261,7 +261,7 @@ class Compiler:
     def convert_image(self, image:str, img_attrib: dict[str, Any]):
 
         # get svg image attributes info or default
-        pixelsize = img_attrib['gcode_pixelsize'] if 'gcode_pixelsize' in img_attrib else 0.1
+        pixelsize = img_attrib['gcode_pixelsize'] if 'gcode_pixelsize' in img_attrib else self.settings["pixel_size"]
 
         # convert image from base64 string
         img = self.decode_base64(image)
@@ -275,13 +275,13 @@ class Compiler:
             img_background = Image.new(mode = "RGBA", size = img.size, color = (255,255,255))
             img = Image.alpha_composite(img_background, img)
 
-            # convert image to black&white (without alpha) and new size #reminder: 'img = img.convert("LA")'
-            img = img.resize((int(float(img_attrib['width']) * 1/float(pixelsize)),
-                            int(float(img_attrib['height']) * 1/float(pixelsize))), Image.Resampling.LANCZOS).convert("L")
-
             if self.settings['showimage']:
                 img.show()
 
+            # convert image to black&white (without alpha) and new size #reminder: 'img = img.convert("LA")'
+            img = img.resize((int(float(img_attrib['width'])/float(pixelsize)),
+                            int(float(img_attrib['height'])/float(pixelsize))), Image.Resampling.LANCZOS).convert("L")
+
             # convert to nparray for fast handling
             return np.array(img)
 

{svg2gcode-2.3.1 → svg2gcode-2.5.0}/svg2gcode/svg_to_gcode/svg_parser/_parser_methods.py

@@ -19,7 +19,7 @@ def _has_style(element: ElementTree.Element, key: str, value: str) -> bool:
     return element.get(key) == value or (element.get("style") and f"{key}:{value}" in element.get("style"))
 
 
-def add_viewbox_transformation(transformation: Transformation, transform_origin, vwbox, origin, scale):
+def add_viewbox_transformation(transformation: Transformation, transform_origin, vwbox, origin, scale, rotate):
     """
     Transform SVG coordinate system to a math-cartesion coordinate system and correct its origin.
     When viewBox is missing the 'height' value of the viewport is used.
@@ -60,6 +60,10 @@ def add_viewbox_transformation(transformation: Transformation, transform_origin,
         if origin is not None and ((vwbox["x"] + origin[0]) or (vwbox["y"]  + origin[1])):
             up_transformation.add_translation(vwbox["x"] + origin[0],vwbox["y"] + origin[1])
 
+        # rotate it (around the origin)
+        if rotate is not None and rotate > 0:
+            up_transformation.add_rotation(rotate)
+
         # scale it
         if scale is not None:
             up_transformation.add_scale(scale[0],scale[1])
@@ -113,7 +117,7 @@ def get_viewBox(root: ElementTree.Element) -> {}:
 
 
 def parse_root(root: ElementTree.Element, transform_origin=True, viewbox=None, draw_hidden=False,
-               visible_root=True, root_transformation=None, origin=None, scale=None) -> List[Curve]:
+               visible_root=True, root_transformation=None, origin=None, scale=None, rotate=None) -> List[Curve]:
 
     """
     Recursively parse an etree root's children into geometric curves.
@@ -170,7 +174,7 @@ def parse_root(root: ElementTree.Element, transform_origin=True, viewbox=None, d
         if draw_hidden or visible:
             if element.tag == "{%s}path" % NAMESPACES["svg"]:
                 path = Path(element.attrib['d'],
-                               add_viewbox_transformation(transformation, transform_origin, viewbox, origin, scale))
+                               add_viewbox_transformation(transformation, transform_origin, viewbox, origin, scale, rotate))
                 curves.extend(path.curves)
             else:
                 if element.tag == "{%s}image" % NAMESPACES["svg"]:
@@ -178,17 +182,17 @@ def parse_root(root: ElementTree.Element, transform_origin=True, viewbox=None, d
 
                     # instantiate curve (image)
                     ri = RasterImage(element.attrib, element.attrib["{%s}href" % NAMESPACES["xlink"]],
-                                add_viewbox_transformation(transformation, transform_origin, viewbox, origin, scale))
+                                add_viewbox_transformation(transformation, transform_origin, viewbox, origin, scale, rotate))
                     curves.append(ri)
 
         # Continue the recursion
-        curves.extend(parse_root(element, transform_origin, viewbox, draw_hidden, visible, transformation, origin, scale))
+        curves.extend(parse_root(element, transform_origin, viewbox, draw_hidden, visible, transformation, origin, scale, rotate))
 
     # ToDo implement shapes class
     return curves
 
 
-def parse_string(svg_string: str, transform_origin=True, viewbox=None, draw_hidden=False, delta_origin=None, scale_factor=None) -> List[Curve]:
+def parse_string(svg_string: str, transform_origin=True, viewbox=None, draw_hidden=False, delta_origin=None, scale_factor=None, rotate_deg=None) -> List[Curve]:
     """
     Recursively parse an svg string into geometric curves. (Wrapper for parse_root)
 
@@ -203,10 +207,10 @@ def parse_string(svg_string: str, transform_origin=True, viewbox=None, draw_hidd
     :return: A list of geometric curves describing the svg. Use the Compiler sub-module to compile them to gcode.
     """
     root = ElementTree.fromstring(svg_string)
-    return parse_root(root, transform_origin, viewbox, draw_hidden, origin=delta_origin, scale=scale_factor)
+    return parse_root(root, transform_origin, viewbox, draw_hidden, origin=delta_origin, scale=scale_factor, rotate=rotate_deg)
 
 
-def parse_file(file_path: str, transform_origin=True, viewbox=None, draw_hidden=False, delta_origin=None, scale_factor=None) -> List[Curve]:
+def parse_file(file_path: str, transform_origin=True, viewbox=None, draw_hidden=False, delta_origin=None, scale_factor=None, rotate_deg=None) -> List[Curve]:
     """
     Recursively parse an svg file into geometric curves. (Wrapper for parse_root)
 
@@ -221,4 +225,4 @@ def parse_file(file_path: str, transform_origin=True, viewbox=None, draw_hidden=
     :return: A list of geometric curves describing the svg. Use the Compiler sub-module to compile them to gcode.
     """
     root = ElementTree.parse(file_path).getroot()
-    return parse_root(root, transform_origin, viewbox, draw_hidden, origin=delta_origin, scale=scale_factor)
+    return parse_root(root, transform_origin, viewbox, draw_hidden, origin=delta_origin, scale=scale_factor, rotate=rotate_deg)