Actually use the barcode height and width parameters
(And reverse their order in the method signature so corrections to the range checks don't break existing code)
This commit is contained in:
parent
ac640785cc
commit
b5f68f6895
|
@ -65,8 +65,8 @@ _SET_HRI_FONT = lambda n: GS + 'f' + n
|
||||||
BARCODE_FONT_A = _SET_HRI_FONT('\x00') # Font type A for HRI barcode chars
|
BARCODE_FONT_A = _SET_HRI_FONT('\x00') # Font type A for HRI barcode chars
|
||||||
BARCODE_FONT_B = _SET_HRI_FONT('\x01') # Font type B for HRI barcode chars
|
BARCODE_FONT_B = _SET_HRI_FONT('\x01') # Font type B for HRI barcode chars
|
||||||
|
|
||||||
BARCODE_HEIGHT = GS + 'h' + '\x64' # Barcode Height [1-255]
|
BARCODE_HEIGHT = GS + 'h' # Barcode Height [1-255]
|
||||||
BARCODE_WIDTH = GS + 'w' + '\x03' # Barcode Width [2-6]
|
BARCODE_WIDTH = GS + 'w' # Barcode Width [2-6]
|
||||||
|
|
||||||
#NOTE: This isn't actually an ESC/POS command. It's the common prefix to the
|
#NOTE: This isn't actually an ESC/POS command. It's the common prefix to the
|
||||||
# two "print bar code" commands:
|
# two "print bar code" commands:
|
||||||
|
|
|
@ -151,18 +151,18 @@ class Escpos:
|
||||||
im = qr_img._img.convert("RGB")
|
im = qr_img._img.convert("RGB")
|
||||||
self.image(im)
|
self.image(im)
|
||||||
|
|
||||||
def barcode(self, code, bc, width, height, pos, font):
|
def barcode(self, code, bc, height, width, pos, font):
|
||||||
""" Print Barcode """
|
""" Print Barcode """
|
||||||
# Align Bar Code()
|
# Align Bar Code()
|
||||||
self._raw(TXT_ALIGN_CT)
|
self._raw(TXT_ALIGN_CT)
|
||||||
# Height
|
# Height
|
||||||
if height >=2 or height <=6:
|
if 1 <= height <= 255:
|
||||||
self._raw(BARCODE_HEIGHT)
|
self._raw(BARCODE_HEIGHT + chr(height))
|
||||||
else:
|
else:
|
||||||
raise BarcodeSizeError()
|
raise BarcodeSizeError()
|
||||||
# Width
|
# Width
|
||||||
if width >= 1 or width <=255:
|
if 2 <= width <= 6:
|
||||||
self._raw(BARCODE_WIDTH)
|
self._raw(BARCODE_WIDTH + chr(width))
|
||||||
else:
|
else:
|
||||||
raise BarcodeSizeError()
|
raise BarcodeSizeError()
|
||||||
# Font
|
# Font
|
||||||
|
|
Loading…
Reference in New Issue