epickiwi/brother_ql
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create_label() convert rotate to int() early on if not 'auto'

Browse Source
This commit is contained in:
Philipp Klaus
2017-10-01 13:26:37 +02:00
parent f8eec9a410
commit 88c0920768
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
brother_ql/brother_ql_create.py
+4 -3
View File
@@ -67,6 +67,7 @@ def create_label(qlr, image, label_size, threshold=70, cut=True, dither=False, c
right_margin_dots = label_specs['right_margin_dots'] right_margin_dots = label_specs['right_margin_dots']
device_pixel_width = qlr.get_pixel_width() device_pixel_width = qlr.get_pixel_width()
rotate = kwargs.get('rotate', 'auto') rotate = kwargs.get('rotate', 'auto')
if rotate != 'auto': rotate = int(rotate)
threshold = 100.0 - threshold threshold = 100.0 - threshold
threshold = min(255, max(0, int(threshold/100.0 * 255))) # from percent to pixel val threshold = min(255, max(0, int(threshold/100.0 * 255))) # from percent to pixel val
@@ -91,8 +92,8 @@ def create_label(qlr, image, label_size, threshold=70, cut=True, dither=False, c
im = im.convert("RGB" if red else "L") im = im.convert("RGB" if red else "L")
if label_specs['kind'] == ENDLESS_LABEL: if label_specs['kind'] == ENDLESS_LABEL:
if rotate != 'auto' and int(rotate) != 0: if rotate not in ('auto', 0):
im = im.rotate(int(rotate), expand=True) im = im.rotate(rotate, expand=True)
if im.size[0] != dots_printable[0]: if im.size[0] != dots_printable[0]:
hsize = int((dots_printable[0] / im.size[0]) * im.size[1]) hsize = int((dots_printable[0] / im.size[0]) * im.size[1])
im = im.resize((dots_printable[0], hsize), Image.ANTIALIAS) im = im.resize((dots_printable[0], hsize), Image.ANTIALIAS)
@@ -105,7 +106,7 @@ def create_label(qlr, image, label_size, threshold=70, cut=True, dither=False, c
if rotate == 'auto': if rotate == 'auto':
if im.size[0] == dots_printable[1] and im.size[1] == dots_printable[0]: if im.size[0] == dots_printable[1] and im.size[1] == dots_printable[0]:
im = im.rotate(90, expand=True) im = im.rotate(90, expand=True)
elif int(rotate) != 0: elif rotate != 0:
im = im.rotate(rotate, expand=True) im = im.rotate(rotate, expand=True)
if im.size[0] != dots_printable[0] or im.size[1] != dots_printable[1]: if im.size[0] != dots_printable[0] or im.size[1] != dots_printable[1]:
raise ValueError("Bad image dimensions: %s. Expecting: %s." % (im.size, dots_printable)) raise ValueError("Bad image dimensions: %s. Expecting: %s." % (im.size, dots_printable))