diff --git a/.gitignore b/.gitignore index 40318df..f6c6e74 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ output.mp4 # log files output.log # images -*.png +map*.png # Built app build # Generated label images diff --git a/belden-logo-superhires.png b/belden-logo-superhires.png new file mode 100644 index 0000000..68d71c4 Binary files /dev/null and b/belden-logo-superhires.png differ diff --git a/label_image.py b/label_image.py index 7bc6395..6f9da6c 100755 --- a/label_image.py +++ b/label_image.py @@ -9,7 +9,7 @@ import numpy as np from util import find_data_file import segno import io -import cairosvg +#import cairosvg #import math @@ -260,12 +260,17 @@ def qr_image(data, width=600): - svg_path = find_data_file("belden-logo.svg") - with open(svg_path, 'rb') as svg_file: - png_image = cairosvg.svg2png(file_obj=svg_file,dpi=width*8, scale=7, background_color="white") - png_image_io = io.BytesIO(png_image) + #svg_path = find_data_file("belden-logo.svg") + #with open(svg_path, 'rb') as svg_file: + # png_image = cairosvg.svg2png(file_obj=svg_file,dpi=width*30, scale=30, background_color="white") + #with open("output.png", 'wb') as file: + # file.write(png_image) + + png_image_io = "belden-logo-superhires.png" png_image_pillow = Image.open(png_image_io) png_width, png_height = png_image_pillow.size + png_image_pillow = png_image_pillow.resize((int(width*5.2), int(width*5.2/png_width*png_height))) + png_width, png_height = png_image_pillow.size # paste belden logo first because it has a big border that would cover stuff up img.paste(png_image_pillow, (int(width*5-png_width/2), int(width*4.25 - png_height/2))) diff --git a/requirements.txt b/requirements.txt index 70ee707..295e078 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ pandas pyarrow ghostscript pyzbar -cairosvg +segno # Development matplotlib diff --git a/setup-label-generator.py b/setup-label-generator.py index bfc7f35..7fc02f3 100644 --- a/setup-label-generator.py +++ b/setup-label-generator.py @@ -10,7 +10,7 @@ import opcode import os import distutils #distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils') -build_exe_options = {"include_msvcr": True, "packages": ["camelot", "setuptools"], "optimize": 0, "silent": True, "include_files": ["gs10030w64.exe", "GothamCond-Medium.otf", "belden-logo.svg"], "excludes": ["scipy", "torch"]} +build_exe_options = {"include_msvcr": True, "packages": ["camelot", "setuptools", "segno"], "optimize": 0, "silent": True, "include_files": ["gs10030w64.exe", "GothamCond-Medium.otf", "belden-logo-superhires.png", "VERSION"], "excludes": ["scipy", "torch"]} # base="Win32GUI" should be used only for Windows GUI app base = "console"