gcode2image 2.4.4__tar.gz → 2.4.6__tar.gz

{gcode2image-2.4.4 → gcode2image-2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gcode2image
-Version: 2.4.4
+Version: 2.4.6
 Summary: gcode2image: convert gcode to image.
 Keywords: engraving,laser,image,laser engraving,PWM,gcode
 Author-email: Johannes Noordanus <mailjohannes.mailnoordanus@gmail.com>

{gcode2image-2.4.4 → gcode2image-2.4.6}/gcode2image.py

@@ -2,14 +2,27 @@
 """
 gcode2image: convert gcode to image.
 """
-__version__ = "2.4.4"
+__version__ = "2.4.6"
 
 import sys
 import re
 import argparse
 from PIL import Image
+from pathlib import Path
 import numpy as np
 
+def ext_check(expected_extension, openner):
+    def extension(filename):
+        suffixes = expected_extension.split(',')
+
+        for suffix in suffixes:
+            if filename.lower().endswith(suffix):
+                return openner(filename)
+
+        print(f"Error: unknown file extension '{Path(filename).suffix}', file extension should be one of {suffixes}, exit ...")
+        sys.exit(1)
+    return extension
+
 # set to 10 pixels per mm
 DEFAULT_RESOLUTION = .1
 
@@ -25,7 +38,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 +261,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 +302,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
 
@@ -301,7 +314,7 @@ def gcode2image(args) -> np.array:
     gc_info = get_gcode_info()
 
     if gc_info['min_X'] is None or gc_info['min_Y'] is None or gc_info['max_X'] is None or gc_info['max_Y'] is None:
-        print(f"Error: gcode file not well formed: missing move commands (X<nr> and or Y<nr> coordinates), exit ...")
+        print(f"Error: cannot detect gcode, wrong file type?, exit ...")
         sys.exit(1)
 
     # handle resolution
@@ -319,18 +332,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']
@@ -448,8 +458,8 @@ def main() -> int:
 
     # Define command line argument interface
     parser = argparse.ArgumentParser(description='Convert a gcode file to image.')
-    parser.add_argument('gcode', type=argparse.FileType('r'), default = sys.stdin, help='name of gcode file to convert')
-    parser.add_argument('image', type=argparse.FileType('w'), help='image out')
+    parser.add_argument('gcode', type=ext_check('.gc,.gcode', argparse.FileType('r')), default = sys.stdin, help='name of gcode file to convert')
+    parser.add_argument('image', type=ext_check('.png,.jpg,.jpeg', argparse.FileType('w')), help='image out')
     parser.add_argument('--resolution', default=pixelsize_default, metavar=f"<default: {DEFAULT_RESOLUTION}>",
         type=float, help="define image resolution by pixel size (mm^2)")
     parser.add_argument('--maxintensity', default=max_laser_power_default, metavar=f"<default: {DEFAULT_MAX_LASER_POWER}>",