svg2gcode 3.0.1__tar.gz → 3.0.3__tar.gz

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg2gcode
-Version: 3.0.1
+Version: 3.0.3
 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>
@@ -41,6 +41,14 @@ See options ```--speedmoves``` and ```--noise``` for example.
 Version 3.0.0 and higher have support for 'stroke' (color) and 'stroke-width' attributes, this means that cutting a path works a bit different now. 
 When the *stroke* attribute of a *path* is nonexistent or set to none, the path will be laser burned with the value set by option *--cuttingpower*.
 
+Also, *svg2gcode* option ```--pathcut``` can be used to override all stroke attributes and force cutting of all *paths* of the SVG.
+But, see the examples below.
+
+Please consider supporting me, so I can make this application better and add new functionality to it: <http://paypal.me/johannesnoordanus/5,00>
+
+My next update will be a major one, I'll add support for the *fill* attribute of SVG objects.
+
+
 To summarize:
 
 Optimized gcode
@@ -70,11 +78,11 @@ also, program *image2gcode* has similar capabilities but handles raster images f
 <sup>(*)</sup> Note that an upgraded and corrected version of this library is included. 
 ### Usage:
 ```
-svg2gcode --help
-usage: runsvg2gcode [-h] [--showimage] [--selfcenter] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>]
-                    [--imagepower <default:300>] [--poweroffset <default:0>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>]
-                    [--rapidmove <default:10>] [--noise <default:0>] [--overscan <default:0>] [--showoverscan] [--constantburn] [--origin Xdelta Ydelta]
-                    [--scale Xfactor Yfactor] [--rotate <default:0>] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
+> svg2gcode --help
+usage: svg2gcode [-h] [--showimage] [--selfcenter] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>] [--imagepower <default:300>]
+                    [--poweroffset <default:0>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>] [--rapidmove <default:10>] [--noise <default:0>]
+                    [--overscan <default:0>] [--showoverscan] [--constantburn] [--origin delta-x delta-y] [--scale factor-x factor-y] [--rotate <default:0>] [--splitfile] [--pathcut]
+                    [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
                     svg gcode
 
 Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.
@@ -98,7 +106,7 @@ options:
   --poweroffset <default:0>
                         pixel intensity to laser power: shift power range [0-imagepower]
   --cuttingpower <default:850>
-                        sets laser power of line drawings/cutting
+                        sets laser power of line (path) 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
@@ -115,6 +123,7 @@ options:
                         scale svg with (factor-x,factor-y) (default not set)
   --rotate <default:0>  number of degrees to rotate
   --splitfile           split gcode output of SVG path and image objects
+  --pathcut             alway cut SVG path objects! (use laser power set with option --cuttingpower)
   --xmaxtravel <default:300>
                         machine x-axis lengh in mm
   --ymaxtravel <default:400>
@@ -214,6 +223,14 @@ Change the *style* attribute line - within file *line_hoek.svg* - to the followi
 ```
     style="fill:none;stroke:none;stroke-width:.1"
 ```
+or add 'gcode-pathcut' to the style string: 
+```
+    style="fill:none;stroke:red;stroke-width:.1;gcode-pathcut:true"
+```
+(Note that this makes it possible to selectively cut path objects within the SVG.)
+  
+or add *svg2gcode* option *--pathcut* to override all path stroke attributes within the SVG document
+
 Run *svg2gcode* (with same options) again.
 Now the gcode after conversion will look like this:
 ```

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/README.md

@@ -27,6 +27,14 @@ See options ```--speedmoves``` and ```--noise``` for example.
 Version 3.0.0 and higher have support for 'stroke' (color) and 'stroke-width' attributes, this means that cutting a path works a bit different now. 
 When the *stroke* attribute of a *path* is nonexistent or set to none, the path will be laser burned with the value set by option *--cuttingpower*.
 
+Also, *svg2gcode* option ```--pathcut``` can be used to override all stroke attributes and force cutting of all *paths* of the SVG.
+But, see the examples below.
+
+Please consider supporting me, so I can make this application better and add new functionality to it: <http://paypal.me/johannesnoordanus/5,00>
+
+My next update will be a major one, I'll add support for the *fill* attribute of SVG objects.
+
+
 To summarize:
 
 Optimized gcode
@@ -56,11 +64,11 @@ also, program *image2gcode* has similar capabilities but handles raster images f
 <sup>(*)</sup> Note that an upgraded and corrected version of this library is included. 
 ### Usage:
 ```
-svg2gcode --help
-usage: runsvg2gcode [-h] [--showimage] [--selfcenter] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>]
-                    [--imagepower <default:300>] [--poweroffset <default:0>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>]
-                    [--rapidmove <default:10>] [--noise <default:0>] [--overscan <default:0>] [--showoverscan] [--constantburn] [--origin Xdelta Ydelta]
-                    [--scale Xfactor Yfactor] [--rotate <default:0>] [--splitfile] [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
+> svg2gcode --help
+usage: svg2gcode [-h] [--showimage] [--selfcenter] [--pixelsize <default:0.1>] [--imagespeed <default:800>] [--cuttingspeed <default:1000>] [--imagepower <default:300>]
+                    [--poweroffset <default:0>] [--cuttingpower <default:850>] [--passes <default:1>] [--pass_depth <default:0>] [--rapidmove <default:10>] [--noise <default:0>]
+                    [--overscan <default:0>] [--showoverscan] [--constantburn] [--origin delta-x delta-y] [--scale factor-x factor-y] [--rotate <default:0>] [--splitfile] [--pathcut]
+                    [--xmaxtravel <default:300>] [--ymaxtravel <default:400>] [--fan] [-V]
                     svg gcode
 
 Convert svg to gcode for GRBL v1.1 compatible diode laser engravers.
@@ -84,7 +92,7 @@ options:
   --poweroffset <default:0>
                         pixel intensity to laser power: shift power range [0-imagepower]
   --cuttingpower <default:850>
-                        sets laser power of line drawings/cutting
+                        sets laser power of line (path) 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
@@ -101,6 +109,7 @@ options:
                         scale svg with (factor-x,factor-y) (default not set)
   --rotate <default:0>  number of degrees to rotate
   --splitfile           split gcode output of SVG path and image objects
+  --pathcut             alway cut SVG path objects! (use laser power set with option --cuttingpower)
   --xmaxtravel <default:300>
                         machine x-axis lengh in mm
   --ymaxtravel <default:400>
@@ -200,6 +209,14 @@ Change the *style* attribute line - within file *line_hoek.svg* - to the followi
 ```
     style="fill:none;stroke:none;stroke-width:.1"
 ```
+or add 'gcode-pathcut' to the style string: 
+```
+    style="fill:none;stroke:red;stroke-width:.1;gcode-pathcut:true"
+```
+(Note that this makes it possible to selectively cut path objects within the SVG.)
+  
+or add *svg2gcode* option *--pathcut* to override all path stroke attributes within the SVG document
+
 Run *svg2gcode* (with same options) again.
 Now the gcode after conversion will look like this:
 ```

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/svg2gcode/__init__.py

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

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/svg2gcode/__main__.py

@@ -36,7 +36,7 @@ def svg2gcode(args) -> int:
         return 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,
-               'pass_depth':args.pass_depth, '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, 'pathcut':args.pathcut,
                'image_poweroffset':args.poweroffset, 'image_overscan':args.overscan, 'image_showoverscan':args.showoverscan})
 
     compiler = init_compiler(args)
@@ -117,7 +117,7 @@ def main() -> int:
     parser.add_argument('--poweroffset', default=cfg["poweroffset_default"], metavar="<default:" +str(cfg["poweroffset_default"])+ ">",
         type=int, help="pixel intensity to laser power: shift power range [0-imagepower]")
     parser.add_argument('--cuttingpower', default=cfg["cuttingpower_default"], metavar="<default:" +str(cfg["cuttingpower_default"])+ ">",
-        type=int, help="sets laser power of line drawings/cutting")
+        type=int, help="sets laser power of line (path) cutting")
     parser.add_argument('--passes', default=cfg["passes_default"], metavar="<default:" +str(cfg["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=cfg["pass_depth_default"], metavar="<default:" + str(cfg["pass_depth_default"])+">",
@@ -137,6 +137,7 @@ def main() -> int:
     parser.add_argument('--rotate', default=cfg["rotate_default"], metavar="<default:" +str(cfg["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('--pathcut', action='store_true', default=False, help='alway cut SVG path objects! (use laser power set with option --cuttingpower)' )
     parser.add_argument('--xmaxtravel', default=cfg["xmaxtravel_default"], metavar="<default:" +str(cfg["xmaxtravel_default"])+ ">",
         type=int, help="machine x-axis lengh in mm")
     parser.add_argument('--ymaxtravel', default=cfg["ymaxtravel_default"], metavar="<default:" +str(cfg["ymaxtravel_default"])+ ">",

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/svg2gcode/svg_to_gcode/__init__.py

@@ -38,7 +38,8 @@ SETTING 	= {
                                 #                       more than 'n'mm
     "pixel_size",               # float                 sets image pixel size (in mm)
     "showimage",                # boolean               show image used for conversion to gcode
-    "splitfile"                 # boolean               return SVG path objects to <filename>.<gcext> and SVG image objects to <filename>_images.<gcext>
+    "splitfile",                # boolean               return SVG path objects to <filename>.<gcext> and SVG image objects to <filename>_images.<gcext>
+    "pathcut"                   # boolean               always cut SVG path objects! use laser_power setting
 }
 
 # Set defaults 'minimum_laser_power', 'pass_depth', 'dwell_time', 'laser_power', 'laser_mode', 'unit', 'distance_mode'
@@ -70,7 +71,8 @@ DEFAULT_SETTING 	= {
     "rapid_move":		10,		# default set to true, for images do a rapid move when skipping more than 10mm
     "pixel_size":               0.1,            # laser kerf is mostly < 0.1mm
     "showimage":                False,          # default image is not shown
-    "splitfile":                False           # SVG path and image objects are emitted to one file: <filename>.<gcext>
+    "splitfile":                False,           # SVG path and image objects are emitted to one file: <filename>.<gcext>
+    "pathcut":                  False           # always cut SVG path objects! use laser_power setting
 }
 
 def check_setting(setting: dict[str,Any] =None) -> bool:
@@ -112,7 +114,7 @@ def check_setting(setting: dict[str,Any] =None) -> bool:
             raise ValueError(f"Unknown '{key}' value '{setting[key]}'. Please specify one of the following: {UNITS}")
         if key == "distance_mode" and setting[key] not in DISTANCEMODE:
             raise ValueError(f"Unknown '{key}' value '{setting[key]}'. Please specify one of the following: {DISTANCEMODE}")
-        if key in {"fan","showimage","splitfile","image_showoverscan"} and setting[key] not in {True,False}:
+        if key in {"fan","showimage","splitfile","pathcut","image_showoverscan"} and setting[key] not in {True,False}:
             raise ValueError(f"Unknown '{key}' value '{setting[key]}'. Please specify one of the following: {{True,False}}")
         if key == "pixel_size" and setting[key] and (not isinstance(setting[key],(float)) or setting[key] <= 0):
             raise TypeError(f"'{key}' is of type '{type(setting[key])}' but should be of type {type(1.0)} and have a value > 0.0")

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/svg2gcode/svg_to_gcode/compiler/_compiler.py

@@ -193,7 +193,10 @@ class Compiler:
 
         image_file_name = file_name.rsplit('.',1)[0] + "_images." + file_name.rsplit('.',1)[1]
         if len(self.gcode) == 0:
-            logger.warn(f'No image found, skipping "{image_file_name}"')
+            if self.settings["splitfile"]:
+                logger.warn(f"No image found, skipping '{image_file_name}'")
+            else:
+                logger.warn(f"No image found in file '{svg_file_name}'")
         else:
             if self.settings["splitfile"]:
                 # emit image objects to <filename>_images.<gcext>
@@ -474,16 +477,16 @@ class Compiler:
         for example "fill:#F4CF84;fill-rule:evenodd;stroke:#D07735;"
         """
 
-        style = {'fill' : None, 'fill-rule': None, 'stroke': None, 'stroke-width': None}
+        style = {'fill' : None, 'fill-rule': None, 'stroke': None, 'stroke-width': None, 'pathcut': None}
 
-        # parse style curve
+        # parse style attribute
 
         if curve.path_attrib and 'style' in curve.path_attrib:
             style_str = curve.path_attrib['style']
 
             # parse fill
             if 'fill' in style_str:
-                fill = re.search('fill:.+;',style_str)
+                fill = re.search('fill:[^;]+;',style_str)
                 if fill:
                     style['fill'] = fill.group(0)[5:-1]
             # parse fill-rule
@@ -493,7 +496,7 @@ class Compiler:
                     style['fill-rule'] = re.search('(evenodd|nonzero)', fill_rule.group(0)).group(0)
             # parse stroke
             if 'stroke' in style_str:
-                stroke = re.search('stroke:.+;',style_str)
+                stroke = re.search('stroke:[^;]+;',style_str)
                 if stroke:
                     style['stroke'] = stroke.group(0)[7:-1]
             # parse stroke-width
@@ -502,16 +505,30 @@ class Compiler:
                 if stroke_width:
                     style['stroke-width'] = re.search('(\d*\.)?\d+', stroke_width.group(0)).group(0)
 
-        # parse direct style curves
+            # parse pathcut
+            if 'gcode-pathcut' in style_str:
+                pathcut = re.search('gcode-pathcut:(true|false)',style_str)
+                if pathcut:
+                    style['pathcut'] = re.search('(true|false)', pathcut.group(0)).group(0)
+
+        # parse other attributes
 
-        # parse fill
+        # parse fill attribute
         if 'fill' in curve.path_attrib:
             style['fill'] = curve.path_attrib['fill']
         if 'fill-rule' in curve.path_attrib:
             style['fill-rule'] = curve.path_attrib['fill-rule']
+        # parse stroke attribute
+        if 'stroke' in curve.path_attrib:
+            style['stroke'] = curve.path_attrib['stroke']
+        # parse stroke-width attribute
         if 'stroke-width' in curve.path_attrib:
             style['stroke-width'] = curve.path_attrib['stroke-width']
 
+        # parse gcode_pathcut attribute
+        if 'gcode_pathcut' in curve.path_attrib:
+            style['pathcut'] = curve.path_attrib['gcode_pathcut']
+
         return style
 
     def append_curves(self, curves: list[Curve]):
@@ -563,12 +580,15 @@ class Compiler:
                 pixel_size = float(self.settings["pixel_size"])
                 # default stroke width is one line (thickness)
                 stroke_width = pixel_size
-                stroke_color = ""
-                width = 0
 
-                style = self.parse_style_attribute(line_chain.get(0))
+                first_line_of_chain = line_chain.get(0)
+
+                width = 0
+                stroke_color = ""
+                style = self.parse_style_attribute(first_line_of_chain)
                 if style:
-                    if style['stroke'] is not None and style['stroke'] != "none":
+                    if not (style['pathcut'] == 'true' or self.settings["pathcut"]) \
+                        and style['stroke'] is not None and style['stroke'] != "none":
                         stroke_color = style['stroke']
                     if style['stroke-width'] is not None and style['stroke-width'] != "none":
                         stroke_width = float(style['stroke-width'])

{svg2gcode-3.0.1 → svg2gcode-3.0.3}/svg2gcode/svg_to_gcode/css_color.py

@@ -3,10 +3,14 @@
     currently only partially implemented
     (definition from  https://www.w3.org/TR/css-color-3/)
 """
-
+import logging
 import math
 import re
 
+logging.basicConfig(format="[%(levelname)s] %(message)s")
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
 css_color_keywords = {
     "aliceblue": { "hex": "#F0F8FF", "decimal": [240,248,255] },
     "antiquewhite": { "hex": "#FAEBD7", "decimal": [250,235,215] },
@@ -199,7 +203,7 @@ def parse_css_color(color: str) -> [int,int,int]:
     rgbcolor = 0
 
     if color in css_color_keywords:
-        rgbcolor = css_color_keywords["saddlebrown"]["decimal"]
+        rgbcolor = css_color_keywords[color]["decimal"]
     else:
         hexcolor = re.search('#[A-Fa-f0-9]+', color)
         if hexcolor:
@@ -247,6 +251,10 @@ def parse_css_color(color: str) -> [int,int,int]:
                     rgbcolor = hsl2rgb(h, s, l)
                     rgbcolor = [int(rgbcolor[0] * 255 * a), int(rgbcolor[1] * 255 * a), int(rgbcolor[2] * 255 * a)]
 
+    if not rgbcolor:
+        logger.warn(f"Not a valid css color: '{color}', color set to 'black'!")
+        rgbcolor = css_color_keywords['black']["decimal"]
+
     return rgbcolor
 
 def rgb24tobw24(rgb24: int) -> int: