From 866bf465981dafa5da071485636f6868dee393ad Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 25 Aug 2022 00:03:54 +0200 Subject: [PATCH] Added QL-1100 and siblings + the wider format supported by QL-1100 and QL-1100NWB (#18) Co-authored-by: Oskar Flordal --- README.md | 5 ++++- brother_ql/labels.py | 9 ++++++--- brother_ql/models.py | 3 +++ pyproject.toml | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e648b95..edfc64b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ QL-500 (✓), QL-550 (✓), QL-560 (✓), QL-570 (✓), QL-580N QL-600 (✓), QL-650TD QL-700 (✓), QL-710W (✓), QL-720NW (✓) QL-800 (✓), QL-810W (✓), QL-820NWB (✓) -QL-1050 (✓), QL-1060N (✓) +QL-1050 (✓), QL-1060N (✓), +QL-1100 (✓), QL-1100NWB, QL-1115NWB. ### Verified labels @@ -31,6 +32,7 @@ The available label names can be listed with `brother_ql info labels`: 54 590 54mm endless 62 696 62mm endless 102 1164 102mm endless + 103 1200 103mm endless 17x54 165 x 566 17mm x 54mm die-cut 17x87 165 x 956 17mm x 87mm die-cut 23x23 202 x 202 23mm x 23mm die-cut @@ -43,6 +45,7 @@ The available label names can be listed with `brother_ql info labels`: 62x100 696 x 1109 62mm x 100mm die-cut 102x51 1164 x 526 102mm x 51mm die-cut 102x152 1164 x 1660 102mm x 153mm die-cut + 103x164 1200 x 1822 103mm x 164mm die-cut d12 94 x 94 12mm round die-cut d24 236 x 236 24mm round die-cut d58 618 x 618 58mm round die-cut diff --git a/brother_ql/labels.py b/brother_ql/labels.py index 2ef3c90..da4423b 100644 --- a/brother_ql/labels.py +++ b/brother_ql/labels.py @@ -89,7 +89,8 @@ def name(self): # type: str Label("54", ( 54, 0), FormFactor.ENDLESS, ( 636, 0), ( 590, 0), 0 , feed_margin=35), Label("62", ( 62, 0), FormFactor.ENDLESS, ( 732, 0), ( 696, 0), 12 , feed_margin=35), Label("62red", ( 62, 0), FormFactor.ENDLESS, ( 732, 0), ( 696, 0), 12 , feed_margin=35, color=Color.BLACK_RED_WHITE), - Label("102", (102, 0), FormFactor.ENDLESS, (1200, 0), (1164, 0), 12 , feed_margin=35, restricted_to_models=['QL-1050', 'QL-1060N']), + Label("102", (102, 0), FormFactor.ENDLESS, (1200, 0), (1164, 0), 12 , feed_margin=35, restricted_to_models=['QL-1050', 'QL-1060N', 'QL-1100', 'QL-1100NWB', 'QL-1115NWB']), + Label("103", (104, 0), FormFactor.ENDLESS, (1224, 0), (1200, 0), 12 , feed_margin=35, restricted_to_models=['QL-1100', 'QL-1100NWB']), Label("17x54", ( 17, 54), FormFactor.DIE_CUT, ( 201, 636), ( 165, 566), 0 ), Label("17x87", ( 17, 87), FormFactor.DIE_CUT, ( 201, 1026), ( 165, 956), 0 ), Label("23x23", ( 23, 23), FormFactor.DIE_CUT, ( 272, 272), ( 202, 202), 42 ), @@ -100,8 +101,10 @@ def name(self): # type: str Label("52x29", ( 52, 29), FormFactor.DIE_CUT, ( 614, 341), ( 578, 271), 0 ), Label("62x29", ( 62, 29), FormFactor.DIE_CUT, ( 732, 341), ( 696, 271), 12 ), Label("62x100", ( 62, 100), FormFactor.DIE_CUT, ( 732, 1179), ( 696, 1109), 12 ), - Label("102x51", (102, 51), FormFactor.DIE_CUT, (1200, 596), (1164, 526), 12 , restricted_to_models=['QL-1050', 'QL-1060N']), - Label("102x152",(102, 153), FormFactor.DIE_CUT, (1200, 1804), (1164, 1660), 12 , restricted_to_models=['QL-1050', 'QL-1060N']), + Label("102x51", (102, 51), FormFactor.DIE_CUT, (1200, 596), (1164, 526), 12 , restricted_to_models=['QL-1050', 'QL-1060N', 'QL-1100', 'QL-1100NWB', 'QL-1115NWB']), + Label("102x152",(102, 153), FormFactor.DIE_CUT, (1200, 1804), (1164, 1660), 12 , restricted_to_models=['QL-1050', 'QL-1060N', 'QL-1100', 'QL-1100NWB', 'QL-1115NWB']), + # size 103 has media width 104 + Label("103x164",(104, 164), FormFactor.DIE_CUT, (1224, 1941), (1200, 1822), 12 , restricted_to_models=['QL-1100', 'QL-1100NWB']), Label("d12", ( 12, 12), FormFactor.ROUND_DIE_CUT, ( 142, 142), ( 94, 94), 113 , feed_margin=35), Label("d24", ( 24, 24), FormFactor.ROUND_DIE_CUT, ( 284, 284), ( 236, 236), 42 ), Label("d58", ( 58, 58), FormFactor.ROUND_DIE_CUT, ( 688, 688), ( 618, 618), 51 ), diff --git a/brother_ql/models.py b/brother_ql/models.py index 1132297..c492dc0 100644 --- a/brother_ql/models.py +++ b/brother_ql/models.py @@ -56,6 +56,9 @@ def name(self): Model('QL-820NWB',(150, 11811), two_color=True), Model('QL-1050', (295, 35433), number_bytes_per_row=162, additional_offset_r=44), Model('QL-1060N', (295, 35433), number_bytes_per_row=162, additional_offset_r=44), + Model('QL-1100', (301, 35434), number_bytes_per_row=162, additional_offset_r=44), + Model('QL-1100NWB',(301, 35434), number_bytes_per_row=162, additional_offset_r=44), + Model('QL-1115NWB',(301, 35434), number_bytes_per_row=162, additional_offset_r=44), Model('PT-P750W', (31, 14172), number_bytes_per_row=16), Model('PT-P900W', (57, 28346), number_bytes_per_row=70), Model('PT-P950NW', (57, 28346), number_bytes_per_row=70), diff --git a/pyproject.toml b/pyproject.toml index 1b4a1f1..96b9c72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,10 @@ keywords = [ "QL-810W", "QL-820NWB", "QL-1050", - "QL-1060N" + "QL-1060N", + "QL-1100", + "QL-1100NWB", + "QL-1115NWB", ] classifiers = [ "Development Status :: 4 - Beta",