svg2gcode 2.4.0__tar.gz → 2.5.0__tar.gz

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

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

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

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

{svg2gcode-2.4.0 → 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)