From 307407609253eaaa11cc11c2cec2cd02041236a7 Mon Sep 17 00:00:00 2001 From: Sync1211 Date: Mon, 17 Oct 2022 19:05:47 +0200 Subject: [PATCH] * Replaced hardcoded paper width with model specific width --- printer.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/printer.py b/printer.py index 56e653d..8e81390 100644 --- a/printer.py +++ b/printer.py @@ -690,23 +690,7 @@ def _main(): mode = 'pbm' - if args.text: - info(i18n('text-printing-mode')) - printer.font_family = font_family or 'font' - if 'pf2' not in text_param: - # TODO: remove hardcoded width - file = magick_text(file, 384, - font_size, font_family) - else: - printer.font_scale = font_size - mode = 'text' - elif args.convert: - file = magick_image(file, 384, ( - 'None' - if args.convert == 'text' - else 'FloydSteinberg') - ) - + # Connect to printer if args.dry: info(i18n('dry-run-test-print-process-only')) printer.dry_run = True @@ -718,6 +702,23 @@ def _main(): printer.scan(identifier, use_result=True) printer.dump = args.dump + # Prepare image / text + if args.text: + info(i18n('text-printing-mode')) + printer.font_family = font_family or 'font' + if 'pf2' not in text_param: + file = magick_text(file, printer.model.paper_width, + font_size, font_family) + else: + printer.font_scale = font_size + mode = 'text' + elif args.convert: + file = magick_image(file, printer.model.paper_width, ( + 'None' + if args.convert == 'text' + else 'FloydSteinberg') + ) + if args.nothing: global Printer Printer = printer