diff --git a/upcean/encode/barcode.py b/upcean/encode/barcode.py index 2ca3f1d5..9e8fb246 100644 --- a/upcean/encode/barcode.py +++ b/upcean/encode/barcode.py @@ -50,12 +50,12 @@ defaultdraw = upcean.support.defaultdraw import upcean.getprefix.getprefix -def validate_create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 12 or len(upc) < 12): return False if(not upcean.validate.validate_upca_checksum(upc)): return False - return create_upca_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upca_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_upca_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -74,12 +74,12 @@ def validate_encode_upca_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheig return encode_upca_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_upcaean_barcode(upc, outfile="./goodwill.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_upcaean_barcode(upc, outfile="./goodwill.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 12 or len(upc) < 12): return False if(not upcean.validate.validate_upca_checksum(upc)): return False - return create_upcaean_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upcaean_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_upcaean_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -98,12 +98,12 @@ def validate_encode_upcaean_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barh return encode_upcaean_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 8 or len(upc) < 8): return False if(not upcean.validate.validate_upce_checksum(upc)): return False - return create_upce_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upce_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_upce_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -121,12 +121,12 @@ def validate_encode_upce_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheig return encode_upce_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 13 or len(upc) < 13): return False if(not upcean.validate.validate_ean13_checksum(upc)): return False - return create_ean13_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_ean13_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_ean13_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -144,12 +144,12 @@ def validate_encode_ean13_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei return encode_ean13_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 8 or len(upc) < 8): return False if(not upcean.validate.validate_ean8_checksum(upc)): return False - return create_ean8_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_ean8_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_ean8_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -168,12 +168,12 @@ def validate_encode_ean8_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheig return encode_ean8_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 14 or len(upc) < 14): return False if(not upcean.validate.validate_itf14_checksum(upc)): return False - return create_itf_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_itf_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_itf_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -192,12 +192,12 @@ def validate_encode_itf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheigh return encode_itf_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 6 or len(upc) < 6): return False if(not upcean.validate.validate_itf6_checksum(upc)): return False - return create_itf6_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_itf6_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_itf6_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -216,12 +216,12 @@ def validate_encode_itf6_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheig return encode_itf6_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def validate_create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 14 or len(upc) < 14): return False if(not upcean.validate.validate_itf14_checksum(upc)): return False - return create_itf14_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_itf14_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def validate_draw_itf14_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -240,11 +240,11 @@ def validate_encode_itf14_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei return encode_itf14_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 12 or len(upc) < 11): return False upc = upcean.validate.fix_upca_checksum(upc) - return create_upca_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upca_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_draw_upca_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -261,11 +261,11 @@ def fix_encode_upca_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(4 return encode_upca_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_upcaean_barcode(upc, outfile="./goodwill.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_upcaean_barcode(upc, outfile="./goodwill.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 12 or len(upc) < 11): return False upc = upcean.validate.fix_upca_checksum(upc) - return create_upcaean_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upcaean_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_draw_upcaean_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -282,11 +282,11 @@ def fix_encode_upcaean_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight return encode_upcaean_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 8 or len(upc) < 7): return False upc = upcean.validate.fix_upce_checksum(upc) - return create_upce_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_upce_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_draw_upce_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -303,11 +303,11 @@ def fix_encode_upce_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(4 return encode_upce_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 13 or len(upc) < 12): return False upc = upcean.validate.fix_ean13_checksum(upc) - return create_ean13_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_ean13_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_draw_ean13_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -324,11 +324,11 @@ def fix_encode_ean13_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=( return encode_ean13_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 8 or len(upc) < 7): return False upc = upcean.validate.fix_ean8_checksum(upc) - return create_ean8_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_ean8_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_draw_ean8_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): @@ -345,7 +345,7 @@ def fix_encode_ean8_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(4 return encode_ean8_barcode(inimage, upc, resize, shiftxy, barheight, barwidth, barcolor, hideinfo) -def fix_create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 14 or len(upc) < 13): return False upc = upcean.validate.fix_itf14_checksum(upc) @@ -366,7 +366,7 @@ def fix_encode_itf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 return encode_itf_barcode(upc, outfile, resize, hideinfo, barheight, barwidth, textxy, barcolor, imageoutlib) -def fix_create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 6 or len(upc) < 5): return False upc = upcean.validate.fix_itf6_checksum(upc) @@ -387,7 +387,7 @@ def fix_encode_itf6_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(4 return encode_itf6_barcode(upc, outfile, resize, hideinfo, barheight, barwidth, textxy, barcolor, imageoutlib) -def fix_create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(len(upc) > 14 or len(upc) < 13): return False upc = upcean.validate.fix_itf14_checksum(upc) diff --git a/upcean/encode/binary.py b/upcean/encode/binary.py index 1d304a01..5184a0e2 100644 --- a/upcean/encode/binary.py +++ b/upcean/encode/binary.py @@ -216,7 +216,7 @@ def draw_binary_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barc imgout = encode_binary_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_binary_barcode(upc, outfile="./binary.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_binary_barcode(upc, outfile="./binary.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -265,5 +265,7 @@ def create_binary_barcode(upc, outfile="./binary.png", resize=1, barheight=(48, if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, upc['type']+"; "+upc['upc']) + if(imagecomment is None): + imagecomment = upc['type']+"; "+upc['upc'] + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment) return True diff --git a/upcean/encode/codabar.py b/upcean/encode/codabar.py index d4c1ae8f..354a4bb3 100644 --- a/upcean/encode/codabar.py +++ b/upcean/encode/codabar.py @@ -332,7 +332,7 @@ def draw_codabar_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_codabar_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_codabar_barcode(upc, outfile="./codabar.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_codabar_barcode(upc, outfile="./codabar.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -381,5 +381,7 @@ def create_codabar_barcode(upc, outfile="./codabar.png", resize=1, barheight=(48 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "codabar; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "codabar; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/code11.py b/upcean/encode/code11.py index 3bd00fa1..082ee366 100644 --- a/upcean/encode/code11.py +++ b/upcean/encode/code11.py @@ -318,7 +318,7 @@ def draw_code11_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barc imgout = encode_code11_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code11_barcode(upc, outfile="./code11.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code11_barcode(upc, outfile="./code11.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -367,5 +367,7 @@ def create_code11_barcode(upc, outfile="./code11.png", resize=1, barheight=(48, if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code11; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code11; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/code128.py b/upcean/encode/code128.py index 0afe2252..960687b0 100644 --- a/upcean/encode/code128.py +++ b/upcean/encode/code128.py @@ -655,7 +655,7 @@ def draw_code128_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_code128_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code128_barcode(upc, outfile="./code128.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code128_barcode(upc, outfile="./code128.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -704,7 +704,9 @@ def create_code128_barcode(upc, outfile="./code128.png", resize=1, barheight=(48 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code128; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True @@ -1215,7 +1217,7 @@ def draw_code128old_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), imgout = encode_code128old_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code128old_barcode(upc, outfile="./code128.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code128old_barcode(upc, outfile="./code128.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -1264,5 +1266,7 @@ def create_code128old_barcode(upc, outfile="./code128.png", resize=1, barheight= if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code128; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/code32.py b/upcean/encode/code32.py index 6276b61e..8183ec4c 100644 --- a/upcean/encode/code32.py +++ b/upcean/encode/code32.py @@ -344,7 +344,7 @@ def draw_code32_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barc imgout = encode_code32_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code32_barcode(upc, outfile="./code32.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code32_barcode(upc, outfile="./code32.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -393,5 +393,7 @@ def create_code32_barcode(upc, outfile="./code32.png", resize=1, barheight=(48, if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code32; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code32; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/code39.py b/upcean/encode/code39.py index 8bd16672..ec51bc39 100644 --- a/upcean/encode/code39.py +++ b/upcean/encode/code39.py @@ -377,7 +377,7 @@ def draw_code39_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barc imgout = encode_code39_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code39_barcode(upc, outfile="./code39.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code39_barcode(upc, outfile="./code39.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -426,7 +426,9 @@ def create_code39_barcode(upc, outfile="./code39.png", resize=1, barheight=(48, if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code39; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def get_code39extended_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)): @@ -754,7 +756,7 @@ def draw_code39extended_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, imgout = encode_code39extended_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code39extended_barcode(upc, outfile="./code39.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code39extended_barcode(upc, outfile="./code39.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -804,5 +806,7 @@ def create_code39extended_barcode(upc, outfile="./code39.png", resize=1, barheig if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code39; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/code93.py b/upcean/encode/code93.py index cdbd10a5..ceada0b4 100644 --- a/upcean/encode/code93.py +++ b/upcean/encode/code93.py @@ -375,7 +375,7 @@ def draw_code93_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barc imgout = encode_code93_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code93_barcode(upc, outfile="./code93.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code93_barcode(upc, outfile="./code93.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -424,7 +424,9 @@ def create_code93_barcode(upc, outfile="./code93.png", resize=1, barheight=(48, if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code93; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code93; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True @@ -750,7 +752,7 @@ def draw_code93extended_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, imgout = encode_code93extended_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_code93extended_barcode(upc, outfile="./code93.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_code93extended_barcode(upc, outfile="./code93.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -799,5 +801,7 @@ def create_code93extended_barcode(upc, outfile="./code93.png", resize=1, barheig if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "code39; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/ean13.py b/upcean/encode/ean13.py index 67b4884d..40a33de1 100644 --- a/upcean/encode/ean13.py +++ b/upcean/encode/ean13.py @@ -528,7 +528,7 @@ def draw_ean13_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barco imgout = encode_ean13_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -577,5 +577,7 @@ def create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean13; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean13; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/ean2.py b/upcean/encode/ean2.py index 0de62d46..8034ad4b 100644 --- a/upcean/encode/ean2.py +++ b/upcean/encode/ean2.py @@ -321,7 +321,7 @@ def draw_ean2sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_ean2_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean2sup_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean2sup_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -370,14 +370,16 @@ def create_ean2sup_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 5 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean2; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def draw_upc2sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): return draw_ean2sup_barcode(upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def create_upc2sup_barcode(upc, outfile="./upc2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): - return create_ean2sup_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) +def create_upc2sup_barcode(upc, outfile="./upc2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): + return create_ean2sup_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def draw_ean2_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): barheightadd = barheight[1] @@ -401,7 +403,7 @@ def draw_ean2_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcol imgout = encode_ean2_barcode([upc_img, upc_preimg], upc, resize, (8 * int(resize), 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean2_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean2_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -450,7 +452,9 @@ def create_ean2_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54), if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean2; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def encode_upc2_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)): @@ -459,5 +463,5 @@ def encode_upc2_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 def draw_upc2_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): return draw_ean2_barcode(upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def create_upc2_barcode(upc, outfile="./upc2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): - return create_ean2_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) +def create_upc2_barcode(upc, outfile="./upc2.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): + return create_ean2_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) diff --git a/upcean/encode/ean5.py b/upcean/encode/ean5.py index 5a958794..3a55b149 100644 --- a/upcean/encode/ean5.py +++ b/upcean/encode/ean5.py @@ -409,7 +409,7 @@ def draw_ean5sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_ean5_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean5sup_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean5sup_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -458,14 +458,16 @@ def create_ean5sup_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 5 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean5; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def draw_upc5sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): return draw_ean5sup_barcode(upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def create_upc5sup_barcode(upc, outfile="./upc5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): - return create_ean5sup_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) +def create_upc5sup_barcode(upc, outfile="./upc5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): + return create_ean5sup_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def draw_ean5_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): barheightadd = barheight[1] @@ -489,7 +491,7 @@ def draw_ean5_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcol imgout = encode_ean5_barcode([upc_img, upc_preimg], upc, resize, (8 * int(resize), 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean5_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean5_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -538,7 +540,9 @@ def create_ean5_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54), if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean5; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def encode_upc5_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)): @@ -547,5 +551,5 @@ def encode_upc5_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 def draw_upc5_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): return draw_ean5_barcode(upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def create_upc5_barcode(upc, outfile="./upc5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): - return create_ean5_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) +def create_upc5_barcode(upc, outfile="./upc5.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): + return create_ean5_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) diff --git a/upcean/encode/ean8.py b/upcean/encode/ean8.py index 50e4b8c3..f151dbaa 100644 --- a/upcean/encode/ean8.py +++ b/upcean/encode/ean8.py @@ -535,7 +535,7 @@ def draw_ean8_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcol imgout = encode_ean8_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -584,5 +584,7 @@ def create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54), if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean8; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "ean8; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/itf.py b/upcean/encode/itf.py index 63250354..b102f075 100644 --- a/upcean/encode/itf.py +++ b/upcean/encode/itf.py @@ -387,7 +387,7 @@ def draw_itf_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolo imgout = encode_itf_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -436,5 +436,7 @@ def create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), b if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "itf; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/itf14.py b/upcean/encode/itf14.py index 31cebbe8..787f9adc 100644 --- a/upcean/encode/itf14.py +++ b/upcean/encode/itf14.py @@ -395,7 +395,7 @@ def draw_itf14_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barco imgout = encode_itf14_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -444,7 +444,9 @@ def create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf14; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "itf14; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def encode_itf6_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)): @@ -453,5 +455,5 @@ def encode_itf6_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 def draw_itf6_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): return draw_itf14_barcode(upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): - return create_itf14_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) +def create_itf6_barcode(upc, outfile="./itf6.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): + return create_itf14_barcode(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) diff --git a/upcean/encode/msi.py b/upcean/encode/msi.py index 7f9659a4..6bc327a0 100644 --- a/upcean/encode/msi.py +++ b/upcean/encode/msi.py @@ -281,7 +281,7 @@ def draw_msi_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolo imgout = encode_msi_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_msi_barcode(upc, outfile="./msi.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_msi_barcode(upc, outfile="./msi.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -330,5 +330,7 @@ def create_msi_barcode(upc, outfile="./msi.png", resize=1, barheight=(48, 54), b if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "msi; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "msi; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/plessey.py b/upcean/encode/plessey.py index 0c4f3762..c387151e 100644 --- a/upcean/encode/plessey.py +++ b/upcean/encode/plessey.py @@ -310,7 +310,7 @@ def draw_plessey_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_plessey_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_plessey_barcode(upc, outfile="./plessey.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_plessey_barcode(upc, outfile="./plessey.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -359,5 +359,7 @@ def create_plessey_barcode(upc, outfile="./plessey.png", resize=1, barheight=(48 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "plessey; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "plessey; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/shortcuts.py b/upcean/encode/shortcuts.py index f7793daa..427c7cef 100644 --- a/upcean/encode/shortcuts.py +++ b/upcean/encode/shortcuts.py @@ -43,11 +43,11 @@ def draw_barcode(bctype, upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar return False -def create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(bctype not in upcean.support.supported_barcodes("tuple")): return False if(hasattr(upcean.encode.barcode, "create_"+bctype+"_barcode") and callable(getattr(upcean.encode.barcode, "create_"+bctype+"_barcode"))): - return getattr(upcean.encode.barcode, "create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return getattr(upcean.encode.barcode, "create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) if(not hasattr(upcean.encode.barcode, "create_"+bctype+"_barcode") or not callable(getattr(upcean.encode.barcode, "create_"+bctype+"_barcode"))): return False return False @@ -79,17 +79,17 @@ def validate_draw_barcode(bctype, upc, resize=1, barheight=(48, 54), barwidth=(1 return draw_barcode(bctype, upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def validate_create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def validate_create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(bctype not in upcean.support.supported_barcodes("tuple")): return False if(bctype == "upca" or bctype == "upcaean" or bctype == "goodwill" or bctype == "upce" or bctype == "ean13" or bctype == "ean8" or bctype == "itf" or bctype == "itf6" or bctype == "itf14"): if(hasattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode") and callable(getattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode"))): - return getattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return getattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) if(not hasattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode") or not callable(getattr(upcean.encode.barcode, "validate_create_"+bctype+"_barcode"))): return False return False if(bctype != "upca" and bctype != "upcaean" and bctype != "upce" and bctype != "ean13" and bctype != "ean8" and bctype != "itf" and bctype != "itf6" and bctype != "itf14"): - return create_barcode(bctype, upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_barcode(bctype, upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) def fix_encode_barcode(bctype, inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)): @@ -118,14 +118,14 @@ def fix_draw_barcode(bctype, upc, resize=1, barheight=(48, 54), barwidth=(1, 1), return draw_barcode(bctype, upc, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) -def fix_create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def fix_create_barcode(bctype, upc, outfile="./barcode.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(bctype not in upcean.support.supported_barcodes("tuple")): return False if(bctype == "upca" or bctype == "upcaean" or bctype == "goodwill" or bctype == "upce" or bctype == "ean13" or bctype == "ean8" or bctype == "itf" or bctype == "itf6" or bctype == "itf14"): if(hasattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode") and callable(getattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode"))): - return getattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return getattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode")(upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) if(not hasattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode") or not callable(getattr(upcean.encode.barcode, "fix_create_"+bctype+"_barcode"))): return False return False if(bctype != "upca" and bctype != "upcaean" and bctype != "upce" and bctype != "ean13" and bctype != "ean8" and bctype != "itf" and bctype != "itf6" and bctype != "itf14"): - return create_barcode(bctype, upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imageoutlib) + return create_barcode(bctype, upc, outfile, resize, barheight, barwidth, barcolor, hideinfo, imagecomment, imageoutlib) diff --git a/upcean/encode/stf.py b/upcean/encode/stf.py index 1d849295..8dff48c9 100644 --- a/upcean/encode/stf.py +++ b/upcean/encode/stf.py @@ -326,7 +326,7 @@ def draw_stf_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolo imgout = encode_stf_barcode([upc_img, upc_preimg], upc, resize, (0, 0), barheight, barwidth, barcolor) return [upc_img, upc_preimg, imageoutlib] -def create_stf_barcode(upc, outfile="./stf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_stf_barcode(upc, outfile="./stf.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -375,6 +375,8 @@ def create_stf_barcode(upc, outfile="./stf.png", resize=1, barheight=(48, 54), b if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "stf; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "stf; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/upca.py b/upcean/encode/upca.py index f405aaf2..07c123c0 100644 --- a/upcean/encode/upca.py +++ b/upcean/encode/upca.py @@ -473,7 +473,7 @@ def draw_upca_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcol imgout = encode_upca_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -522,7 +522,9 @@ def create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "upca; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def get_upcaean_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)): @@ -923,7 +925,7 @@ def draw_upcaean_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_upcaean_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_upcaean_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_upcaean_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -972,5 +974,7 @@ def create_upcaean_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 5 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "upca; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/upcavar.py b/upcean/encode/upcavar.py index 574f5704..255cfac7 100644 --- a/upcean/encode/upcavar.py +++ b/upcean/encode/upcavar.py @@ -481,7 +481,7 @@ def draw_upcavar_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), bar imgout = encode_upcavar_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_upcavar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_upcavar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -530,7 +530,9 @@ def create_upcavar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 5 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "upcavar; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True def get_upcaeanvar_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)): @@ -937,7 +939,7 @@ def draw_upcaeanvar_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), imgout = encode_upcaeanvar_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_upcaeanvar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_upcaeanvar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -986,5 +988,7 @@ def create_upcaeanvar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48 if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "upcavar; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/encode/upce.py b/upcean/encode/upce.py index 2a0f7a9f..9cfdd1e1 100644 --- a/upcean/encode/upce.py +++ b/upcean/encode/upce.py @@ -559,7 +559,7 @@ def draw_upce_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcol imgout = encode_upce_barcode([upc_img, upc_preimg], fullupc, resize, (0, 0), barheight, barwidth, barcolor, hideinfo) return [upc_img, upc_preimg, imageoutlib] -def create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw): +def create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imagecomment=None, imageoutlib=defaultdraw): if(not pilsupport and imageoutlib == "pillow"): imageoutlib = "svgwrite" if(not cairosupport and (imageoutlib == "cairo" or imageoutlib == "cairosvg")): @@ -608,5 +608,7 @@ def create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54), if(oldoutfile is None or isinstance(oldoutfile, bool)): return [upc_img, upc_preimg, imageoutlib] else: - return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upce; "+upc, imageoutlib) + if(imagecomment is None): + imagecomment = "upce; "+upc + return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, imagecomment, imageoutlib) return True diff --git a/upcean/oopfuncs/oopfuncs.py b/upcean/oopfuncs/oopfuncs.py index ec456742..de2b8dd6 100644 --- a/upcean/oopfuncs/oopfuncs.py +++ b/upcean/oopfuncs/oopfuncs.py @@ -78,6 +78,7 @@ def __init__(self, type=None, code=None): self.barcolor = (0, 0, 0) self.textcolor = (0, 0, 0) self.bgcolor = (255, 255, 255) + self.imagecomment = None self.imageoutlib = "pillow" self.return_check = False self.return_type = "dict" @@ -125,21 +126,21 @@ def create_barcode(self, filename=None, size=None): filename = self.filename if(size is None): size = self.size - return upcean.encode.create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imageoutlib) + return upcean.encode.create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imagecomment, self.imageoutlib) def validate_create_barcode(self, filename=None, size=None): if(filename is None): filename = self.filename if(size is None): size = self.size - return upcean.encode.validate_create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imageoutlib) + return upcean.encode.validate_create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imagecomment, self.imageoutlib) def fix_create_barcode(self, filename=None, size=None): if(filename is None): filename = self.filename if(size is None): size = self.size - return upcean.encode.fix_create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imageoutlib) + return upcean.encode.fix_create_barcode(self.type, self.code, filename, size, self.barheight, self.barwidth, (self.barcolor, self.textcolor, self.bgcolor), (self.hidesn, self.hidecd, self.hidetext), self.imagecomment, self.imageoutlib) def draw_barcode(self, size=None): if(size is None):