svg2gcode 2.6.1__tar.gz → 2.6.3__tar.gz

{svg2gcode-2.6.1 → svg2gcode-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg2gcode
-Version: 2.6.1
+Version: 2.6.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>

{svg2gcode-2.6.1 → svg2gcode-2.6.3}/svg2gcode/__init__.py

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

{svg2gcode-2.6.1 → svg2gcode-2.6.3}/svg2gcode/svg_to_gcode/compiler/_compiler.py

@@ -77,8 +77,12 @@ class Compiler:
     def gcode_file_header(self):
 	# add generator info and boundingbox for this code
 
+        params = ''
+        for k,v in self.params.items():
+            params += f";      {k}: {v},\n"
+
         gcode = [ f";    svg2gcode {__version__} ({str(datetime.now()).split('.')[0]})",
-                  f";    arguments: {self.params}",
+                  f";    arguments: \n{params}",
                   f";    GRBL 1.1, unit={self.settings['unit']}, {self.settings['distance_mode']} coordinates\n" ]
 
         if self._boundingbox:
@@ -281,9 +285,6 @@ class Compiler:
             img_background = Image.new(mode = "RGBA", size = img.size, color = (255,255,255))
             img = Image.alpha_composite(img_background, img)
 
-            if self.settings['showimage']:
-                img.show()
-
             # Note that the image resize action below is based on the following:
             # - the image data (linked file or embedded) has a certain source resolution (number of pixels WidthxHeight)
             # - image attributes 'width' and 'height' are in user units
@@ -302,6 +303,9 @@ class Compiler:
             img = img.resize((int(float(img_attrib['width'])/float(pixelsize)),
                             int(float(img_attrib['height'])/float(pixelsize))), Image.Resampling.LANCZOS).convert("L")
 
+            if self.settings['showimage']:
+                img.show()
+
             # convert to nparray for fast handling
             return np.array(img)
 
@@ -328,8 +332,12 @@ class Compiler:
         speedmoves = img_attrib['gcode_speedmoves'] if 'gcode_speedmoves' in img_attrib else self.settings["rapid_move"]
 
         # set header for this image
-        self.gcode += [f"; image name: {img_attrib['id']}, pixelsize: {pixelsize}, speed: {speed},\n"
-                       f';             maxpower: {maxpower}, speedmoves {speedmoves}, noise level {noise}']
+        self.gcode += [f"; image name: {img_attrib['id']},\n"
+                       f";       pixelsize: {pixelsize},\n"
+                       f";       speed: {speed},\n"
+                       f";       maxpower: {maxpower},\n"
+                       f";       speedmoves: {speedmoves},\n"
+                       f";       noise level: {noise}\n"]
 
         # set X/Y-axis precision to number of digits after the decimal separator
         XY_prec = len(str(pixelsize).split('.')[1])

{svg2gcode-2.6.1 → svg2gcode-2.6.3}/svg2gcode/svg_to_gcode/compiler/interfaces/_gcode.py

@@ -36,7 +36,13 @@ class Gcode(Interface):
         # G94 (set Feed rate to 'unit'/min)
         # note that G0 mode hase a machine defined movement speed ('Feed Rate') and is the default motion mode upon power up and reset.
         # note that some or all gcodes above might be machine defaults, this is to make sure they are
-        return "; rapid movement,XY plane,cutter compensation off,coordinate system 1,move 'unit'/min\nG0 G17 G40 G54 G94"
+        return ("\n; Machine settings:\n"
+                ";    rapid movement,\n"
+                ";    XY plane,\n"
+                ";    cutter compensation off,\n"
+                ";    coordinate system 1,\n"
+                ";    move 'unit'/min\n"
+                "G0 G17 G40 G54 G94\n")
 
     def set_movement_speed(self, speed):
         self._next_speed = speed