* options to handle invalid vertical and/or horizontal printer alignment

* remove additional padding from qr code
* use qr code margin option also as minimum spacing to upper and lower label border
* fix positioning of ASN number
* Add Avery L7871 label definition (it's a clone of 4731)
This commit is contained in:
OliverFriedrich 2025-03-28 00:43:38 +01:00
parent 9137595e22
commit 55f9f91b55
2 changed files with 24 additions and 10 deletions

View file

@ -26,6 +26,7 @@ labelInfo = {
3044: (2, 11, (32, 10), (2, 2), (1, 1), (66.5 * mm, 120.5 * mm)),
# 189x 25.4mm x 10mm mini labels
4731: (7, 27, (25.4 * mm, 10 * mm), (2.5 * mm, 0), (9 * mm, 13.5 * mm), A4),
7871: (7, 27, (25.4 * mm, 10 * mm), (2.5 * mm, 0), (9 * mm, 13.5 * mm), A4),
# 2.6 x 1 address labels
5160: (3, 10, (187, 72), (11, 0), (14, 36), A4),
5161: (2, 10, (288, 72), (0, 0), (18, 36), A4),
@ -44,7 +45,7 @@ labelInfo = {
class AveryLabel:
def __init__(self, label, **kwargs):
def __init__(self, label, pageoffset, **kwargs):
data = labelInfo[label]
self.across = data[0]
self.down = data[1]
@ -55,6 +56,8 @@ class AveryLabel:
self.debug = False
self.pagesize = data[5]
self.position = 0
self.pageoffset = pageoffset
self.__dict__.update(kwargs)
def open(self, filename):
@ -76,8 +79,8 @@ class AveryLabel:
y, x = divmod(x, self.across)
return (
self.margins[0] + x * self.labelsep[0],
self.pagesize[1] - self.margins[1] - (y + 1) * self.labelsep[1],
self.margins[0] + x * self.labelsep[0] + self.pageoffset[0],
self.pagesize[1] - self.margins[1] - (y + 1) * self.labelsep[1] - self.pageoffset[1],
)
def advance(self):
@ -101,7 +104,7 @@ class AveryLabel:
# Or, pass a callable and an iterator. We'll do one label
# per iteration of the iterator.
def render(self, thing, count, offset=0, *args):
def render(self, thing, count, offset=0, pageshift=(0 * mm, 0 * mm), *args):
""" render loop"""
assert callable(thing) or isinstance(thing, str)
if isinstance(count, Iterator):
@ -128,6 +131,7 @@ class AveryLabel:
canv = self.canvas
for chunk in iterator:
canv.saveState()
canv.translate(*self.top_left())
if self.debug:
canv.setLineWidth(0.25)