gcode2image 2.4.3__py3-none-any.whl → 2.4.5__py3-none-any.whl

{gcode2image-2.4.3.dist-info → gcode2image-2.4.5.dist-info}/METADATA

@@ -1,16 +1,17 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: gcode2image
-Version: 2.4.3
+Version: 2.4.5
 Summary: gcode2image: convert gcode to image.
 Keywords: engraving,laser,image,laser engraving,PWM,gcode
 Author-email: Johannes Noordanus <mailjohannes.mailnoordanus@gmail.com>
-Requires-Python: >=3.7
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Classifier: License :: OSI Approved :: MIT License
+License-Expression: MIT
 License-File: LICENSE
 Requires-Dist: numpy >= 1.24.3, <= 2.4.6
-Requires-Dist: Pillow >= 9.5.0
+Requires-Dist: Pillow >= 12.2.0
 Project-URL: Home, https://github.com/johannesnoordanus/gcode2image
+Import-Name: gcode2image
 
 # gcode2image
 

gcode2image-2.4.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+gcode2image.py,sha256=mLzH8VjwCO4I5gpcZdi03koCTqe5MAzVIm4waJtftf4,17638
+gcode2image-2.4.5.dist-info/entry_points.txt,sha256=3WTwx9hWoGPO7A4sCDOWktfO-uanp6gKGl25rZ3UHjo,48
+gcode2image-2.4.5.dist-info/licenses/LICENSE,sha256=ghSxQl_EUJUTiu712NkZkroJHvgOrR0j4CddAq8Y7Tc,1085
+gcode2image-2.4.5.dist-info/WHEEL,sha256=lqN8jXt_QloFOGcx9kStvWbryhfEXoI2F2z-YURm350,81
+gcode2image-2.4.5.dist-info/METADATA,sha256=VrNhqvGZEl4TNWeIf2hzOLXMFh9doYgZB8vYKKejT1I,4585
+gcode2image-2.4.5.dist-info/RECORD,,

{gcode2image-2.4.3.dist-info → gcode2image-2.4.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.12.0
+Generator: flit 4.1.0
 Root-Is-Purelib: true
 Tag: py3-none-any

gcode2image.py

@@ -2,7 +2,7 @@
 """
 gcode2image: convert gcode to image.
 """
-__version__ = "2.4.3"
+__version__ = "2.4.5"
 
 import sys
 import re
@@ -25,7 +25,7 @@ def gcode2image(args) -> np.array:
     # set args
     gcode = args.gcode
 
-    float_pattern = "[+\-]?[0-9]+(\.[0-9]+)?"
+    float_pattern = r"[+\-]?[0-9]+(\.[0-9]+)?"
 
     X_pattern = f"X{float_pattern}"
     Y_pattern = f"Y{float_pattern}"
@@ -248,7 +248,7 @@ def gcode2image(args) -> np.array:
 
     def get_gcode_info():
         nonlocal gcode
-        gc_info = { 'min_X': None, 'min_Y': None, 'max_X': None, 'max_Y': None, 'max_S': None, 'pixelsize': None, 'M': None, 'max_laser_power': None }
+        gc_info = { 'min_X': None, 'min_Y': None, 'max_X': None, 'max_Y': None, 'max_S': None, 'pixelsize': None, 'M': None, 'max_image_laser_power': None }
 
         while True:
             line = gcode.readline()
@@ -289,7 +289,7 @@ def gcode2image(args) -> np.array:
                 max_laser_power = re.search(f"^;.*maximum_image_laser_power:? +{float_pattern}", line)
                 if max_laser_power:
                     max_laser_power = re.search(f"maximum_image_laser_power:? +{float_pattern}", max_laser_power.group()).group()
-                    gc_info['max_laser_power'] = float(re.search(f"{float_pattern}", max_laser_power).group())
+                    gc_info['max_image_laser_power'] = float(re.search(f"{float_pattern}", max_laser_power).group())
 
         return gc_info
 
@@ -319,18 +319,15 @@ def gcode2image(args) -> np.array:
 
     # handle pixel intensity
     if args.maxintensity is not None:
+        # commandline setting is followed
         max_laser_power = args.maxintensity
-    elif gc_info['max_laser_power']:
-        max_laser_power = gc_info['max_laser_power']
-        print(f"maxintensity is set to {max_laser_power} (found within '{args.gcode.name}')")
     else:
-        max_S = gc_info['max_S']
-        if max_S and max_S > DEFAULT_MAX_LASER_POWER:
-            # self calibrate
-            max_laser_power = max_S
-        else:
-            max_laser_power = DEFAULT_MAX_LASER_POWER
-        print(f"maxintensity is set to {max_laser_power} (option '--maxintensity' is not supplied or found in '{args.gcode.name}')")
+        max_laser_power = DEFAULT_MAX_LASER_POWER
+        if gc_info['max_image_laser_power']:
+            max_laser_power = gc_info['max_image_laser_power']
+        if gc_info['max_S'] and gc_info['max_S'] > max_laser_power:
+            max_laser_power = gc_info['max_S']
+    print(f"maxintensity is set to {max_laser_power}")
 
     # handle missing G1 and M3(4) commands
     M = gc_info['M']

gcode2image-2.4.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-gcode2image.py,sha256=ukEVP9-yb5Fj2FzsQklqCzbd5tbVjFIueI_QMbmLPXQ,17792
-gcode2image-2.4.3.dist-info/entry_points.txt,sha256=3WTwx9hWoGPO7A4sCDOWktfO-uanp6gKGl25rZ3UHjo,48
-gcode2image-2.4.3.dist-info/licenses/LICENSE,sha256=ghSxQl_EUJUTiu712NkZkroJHvgOrR0j4CddAq8Y7Tc,1085
-gcode2image-2.4.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-gcode2image-2.4.3.dist-info/METADATA,sha256=5leyIJRTU-4Wzme2Vg0kbrNUMeyJM1yWC_169hVfcvk,4585
-gcode2image-2.4.3.dist-info/RECORD,,