Added offset option in cli

Author: labbots

.gitignore

@@ -99,3 +99,4 @@ dmypy.json
 .pyre/
 .idea
 data/
+nimmy.log

NiimPrintX/cli/command.py

@@ -52,6 +52,20 @@ def niimbot_cli(ctx, verbose):
     show_default=True,
     help="Print quantity",
 )
+@click.option(
+    "--vo",
+    "vertical_offset",
+    default=0,
+    show_default=True,
+    help="Vertical offset in pixels",
+)
+@click.option(
+    "--ho",
+    "horizontal_offset",
+    default=0,
+    show_default=True,
+    help="Horizontal offset in pixels",
+)
 @click.option(
     "-r",
     "--rotate",
@@ -67,7 +81,7 @@ def niimbot_cli(ctx, verbose):
     required=True,
     help="Image path",
 )
-def print_command(model, density, rotate, image, quantity):
+def print_command(model, density, rotate, image, quantity, vertical_offset, horizontal_offset):
     logger.info(f"Niimbot Printing Start")
 
     if model in ("b1", "b18", "b21"):
@@ -84,19 +98,20 @@ def print_command(model, density, rotate, image, quantity):
             # PIL library rotates counterclockwise, so we need to multiply by -1
             image = image.rotate(-int(rotate), expand=True)
         assert image.width <= max_width_px, f"Image width too big for {model.upper()}"
-        asyncio.run(_print(model, density, image, quantity))
+        asyncio.run(_print(model, density, image, quantity, vertical_offset, horizontal_offset))
     except Exception as e:
         logger.info(f"{e}")
 
 
-async def _print(model, density, image, quantity):
+async def _print(model, density, image, quantity, vertical_offset, horizontal_offset):
     try:
         print_info("Starting print job")
         device = await find_device(model)
         printer = PrinterClient(device)
         if await printer.connect():
             print(f"Connected to {device.name}")
-        await printer.print_image(image, density=density, quantity=quantity)
+        await printer.print_image(image, density=density, quantity=quantity, vertical_offset=vertical_offset,
+                                  horizontal_offset=horizontal_offset)
         print_success("Print job completed")
         await printer.disconnect()
     except Exception as e:
@@ -134,7 +149,7 @@ async def _info(model):
     except Exception as e:
         logger.debug(f"{e}")
         print_error(e)
-        #await printer.disconnect()
+        # await printer.disconnect()
 
 
 cli = click.CommandCollection(sources=[niimbot_cli])

NiimPrintX/nimmy/printer.py

@@ -8,11 +8,11 @@
 from .logger_config import get_logger
 from .packet import NiimbotPacket, packet_to_int
 
-
 from devtools import debug
 
 logger = get_logger()
 
+
 class InfoEnum(enum.IntEnum):
     DENSITY = 1
     PRINTSPEED = 2
@@ -125,15 +125,16 @@ def notification_handler(self, sender, data):
         self.notification_data = data
         self.notification_event.set()
 
-    async def print_image(self, image: Image, density: int = 3, quantity: int = 1):
+    async def print_image(self, image: Image, density: int = 3, quantity: int = 1, vertical_offset= 0,
+                          horizontal_offset = 0):
         await self.set_label_density(density)
         await self.set_label_type(1)
         await self.start_print()
         await self.start_page_print()
         await self.set_dimension(image.height, image.width)
         await self.set_quantity(quantity)
 
-        for pkt in self._encode_image(image):
+        for pkt in self._encode_image(image, vertical_offset, horizontal_offset):
             # Send each line and wait for a response or status check
             await self.write_raw(pkt)
             # Adding a short delay or status check here can help manage buffer issues
@@ -150,8 +151,19 @@ async def print_image(self, image: Image, density: int = 3, quantity: int = 1):
 
         await self.end_print()
 
-    def _encode_image(self, image: Image):
+    def _encode_image(self, image: Image, vertical_offset=0, horizontal_offset=0):
+        # Convert the image to monochrome
         img = ImageOps.invert(image.convert("L")).convert("1")
+
+        # Apply horizontal offset
+        if horizontal_offset > 0:
+            img = ImageOps.expand(img, border=(horizontal_offset, 0, 0, 0), fill=1)
+        else:
+            img = img.crop((-horizontal_offset, 0, img.width, img.height))
+
+        # Add vertical padding for vertical offset
+        img = ImageOps.expand(img, border=(0, vertical_offset, 0, 0), fill=1)
+
         for y in range(img.height):
             line_data = [img.getpixel((x, y)) for x in range(img.width)]
             line_data = "".join("0" if pix == 0 else "1" for pix in line_data)

README.md

@@ -120,4 +120,17 @@ python -m NiimPrintX.ui
 ```
 
 ## Contributing
-Contributions are welcome! Please fork the repository and submit a pull request with your improvements.
+Contributions are welcome! Please fork the repository and submit a pull request with your improvements.
+
+## Credits
+* Icons made by [Dave Gandy](https://www.flaticon.com/authors/dave-gandy) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [Pixel perfect](https://www.flaticon.com/authors/pixel-perfect) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [Freepik](https://www.freepik.com) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [rddrt](https://www.flaticon.com/authors/rddrt) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [Icongeek26](https://www.flaticon.com/authors/icongeek26) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [SyafriStudio](https://www.flaticon.com/authors/syafristudio) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [Wahyu Adam](https://www.flaticon.com/authors/wahyu-adam) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [meaicon](https://www.flaticon.com/authors/meaicon) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [IconKanan](https://www.flaticon.com/authors/iconkanan) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [kornkun](https://www.flaticon.com/authors/kornkun) from [www.flaticon.com](https://www.flaticon.com/)
+* Icons made by [Rifaldi Ridha Aisy](https://www.flaticon.com/authors/rifaldi-ridha-aisy) from [www.flaticon.com](https://www.flaticon.com/)

bin/process_png.py

@@ -0,0 +1,36 @@
+import os
+import shutil
+from PIL import Image
+import subprocess
+import click
+import glob
+
+
+@click.command()
+@click.argument('image_directory', type=click.Path(exists=True))
+def process_images(image_directory):
+    # Create subdirectories
+    original_dir = os.path.join(image_directory, 'original')
+    resized_dir = os.path.join(image_directory, '50x50')
+
+    os.makedirs(original_dir, exist_ok=True)
+    os.makedirs(resized_dir, exist_ok=True)
+
+    # Copy files to subdirectories
+    for filename in glob.glob(os.path.join(image_directory, '*.png')):
+        shutil.copy(filename, original_dir)
+        shutil.copy(filename, resized_dir)
+
+    # Run mogrify commands
+    subprocess.run(['mogrify', '-resize', '50x50', os.path.join(resized_dir, '*.png')])
+    subprocess.run(['mogrify', '-format', 'png', '-alpha', 'on', os.path.join(resized_dir, '*.png')])
+    subprocess.run(['mogrify', '-fill', 'black', '-colorize', '100', os.path.join(resized_dir, '*.png')])
+
+    # Process images with PIL
+    for image_path in glob.glob(os.path.join(resized_dir, '*.png')):
+        with Image.open(image_path).convert("RGBA").resize((50, 50), Image.Resampling.LANCZOS) as image:
+            image.save(image_path)
+
+
+if __name__ == '__main__':
+    process_images()