Merge pull request #18 from LleidaHack/new-year-config-and-improvements

new config and improvements

Author: tonlls

Config.py

@@ -26,9 +26,15 @@
 BAK_PATH = path.join(RES_PATH, EDITIONS_FOLDER, EDITION, BAK_FILE)
 
 # FONT_FILE = 'Montserrat-Regular.ttf'
-FONT_FILE = 'SpaceMono-Regular.ttf'
+FONT_FILE = 'SpaceMono-Bold.ttf'
 FONT_PATH = path.join(RES_PATH, FONT_FILE)
-FONT_SIZE = 80
+TYPE_FONT_SIZE = 18
+NAME_FONT_SIZE = 12
 FONT_COLOR = (0,0,0)
-FONT = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+WHITE_FONT_COLOR = (255,255,255)
+TYPE_FONT = ImageFont.truetype(FONT_PATH, TYPE_FONT_SIZE)
+NAME_FONT = ImageFont.truetype(FONT_PATH, NAME_FONT_SIZE)
 # FONT = ImageFont.truetype("Symbola.ttf", 60, encoding='unic')
+
+MAIN_COLOR = (31, 33, 36)
+BAK_COLOR = (247, 247, 242)

Model.py

@@ -13,8 +13,9 @@ class Card:
 	QR_POS = (1301, 172)
 	QR_SIZE = (723, 723)
 	QR_BORDER_SIZE = 0
-	TYPE_POS = (850, 1450)
-	NAME_POS = (500, 1250)
+	TYPE_POS = (0, 155)
+	# NAME_POS = (500, 1250)
+	NAME_POS = (140, 120)
 	NICK_POS = (1198, 870)
 	# LOGO_POS = (920, 250)
 	# LOGO_SIZE = (550, 350)
@@ -46,7 +47,7 @@ def generate_qr(self, crypt_id=False):
 
 	def generate_card(self, rgb_back=(255, 255, 255)):
 		self.card = Image.open(Config.BAK_PATH)
-		Tools.draw_text(self.card, self.type, Card.TYPE_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.type, Card.TYPE_POS, Config.TYPE_FONT, Config.WHITE_FONT_COLOR)
 
 	@staticmethod
 	def get_data():
@@ -77,7 +78,7 @@ def generate_card(self, rgb_back=(255, 255, 255)):
 		super().generate_card(rgb_back)
 		if self.has_qr:
 			self.card.paste(self.qr, Card.QR_POS)
-		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.NAME_FONT, Config.WHITE_FONT_COLOR)
 
 	@staticmethod
 	def get_data(name=None):
@@ -103,7 +104,7 @@ def __init__(self, name, image):
 
 	def generate_card(self, rgb_back=(255, 255, 255)):
 		super().generate_card(rgb_back)
-		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.NAME_FONT, Config.WHITE_FONT_COLOR)
 		image = Image.open(self.logopath).convert("RGBA")  # .resize((550,350), Image.ANTIALIAS)
 		image = Tools.scale(image, Card.QR_SIZE)
 		self.card.paste(image, Card.QR_POS)
@@ -138,7 +139,7 @@ def generate_card(self, rgb_back=(255, 255, 255)):
 		image = Image.open(Volunteer.__LOGO_PATH).convert("RGBA")
 		image = Tools.scale(image, Card.QR_SIZE)
 		self.card.paste(image, Card.QR_POS)
-		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.NAME_FONT, Config.WHITE_FONT_COLOR)
 
 	@staticmethod
 	def get_data(name=None):
@@ -167,7 +168,7 @@ def generate_card(self, rgb_back=(255, 255, 255)):
 		image = Image.open(Organizer.__LOGO_PATH).convert("RGBA")
 		image = Tools.scale(image, Card.QR_SIZE)
 		self.card.paste(image, Card.QR_POS)
-		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.NAME_FONT, Config.WHITE_FONT_COLOR, False)
 
 	@staticmethod
 	def get_data(name=None):
@@ -199,7 +200,7 @@ def __init__(self, id, data):
 	def generate_card(self, rgb_back=(255, 255, 255)):
 		super().generate_card(rgb_back)
 		self.card.paste(self.qr, Card.QR_POS)
-		Tools.draw_text(self.card, self.name+'    '+self.nick, Card.NAME_POS, Config.FONT, Config.FONT_COLOR)
+		Tools.draw_text(self.card, self.name, Card.NAME_POS, Config.NAME_FONT, Config.WHITE_FONT_COLOR, False)
 		# Tools.draw_text(self.card, self.nick, Card.NICK_POS, Config.FONT)
 
 	@staticmethod

Tools.py

@@ -4,6 +4,7 @@
 
 import qrcode
 from PIL import ImageDraw, Image
+import Config
 
 
 def create_dir(path):
@@ -27,10 +28,15 @@ def empty_dir(path, delete_files=True, delete_dirs=True):
 					os.remove(os.path.join(root, dir))
 
 
-def draw_text(image, text, pos, font, fill):
+def draw_text(image, text, pos, font, fill, centrate=True, mayus=True):
+	if mayus:
+		text = text.upper()
 	draw = ImageDraw.Draw(image)
 	w, h = draw.textsize(text, font=font)
-	ImageDraw.Draw(image).text(((image.width-w)/2, pos[1]), text, font=font,fill=fill)
+	if centrate:
+		ImageDraw.Draw(image).text(((image.width-w)/2, pos[1]), text, font=font,fill=fill)
+	else:
+		ImageDraw.Draw(image).text(pos, text, font=font,fill=fill)
 
 
 def scale(image, max_size, add_mask=True, method=Image.ANTIALIAS):
@@ -46,7 +52,7 @@ def scale(image, max_size, add_mask=True, method=Image.ANTIALIAS):
 		scaled = image.resize((int((float(max_size[1]) * im_aspect) + 0.5), max_size[1]), method)
 
 	offset = (((max_size[0] - scaled.size[0]) / 2), ((max_size[1] - scaled.size[1]) / 2))
-	back = Image.new("RGB", max_size, "white")
+	back = Image.new("RGBA", max_size, Config.BAK_COLOR)
 	if add_mask:
 		back.paste(scaled, (int(offset[0]), int(offset[1])), scaled)
 	else:
@@ -63,7 +69,9 @@ def generate_qr(input, size, border_size):
 		border=border_size)
 	qr.add_data(input)
 	qr.make(fit=True)
+	# qr = qr.make_image(fill_color=5, back_color=Config.BAK_COLOR)
 	qr = qr.make_image()
+	# qr.show()
 	return qr
 
 

main.py

@@ -5,8 +5,8 @@
 import os
 
 users = []
-users += Model.Contestant.get_data()
-# users += Model.Organizer.get_data()
+# users += Model.Contestant.get_data()
+users += Model.Organizer.get_data()
 # users += Model.Volunteer.get_data()
 # users += Model.Company.get_data()
 # users += Model.Guest.get_data()
@@ -17,4 +17,5 @@
 
 for u in users:
 	u.generate_card()
-	u.save()
+	u.save()
+	break

requirements.txt

@@ -16,15 +16,15 @@ grpcio==1.25.0
 httplib2==0.19.0
 idna==2.8
 msgpack==0.6.2
-Pillow==9.0.1
-pkg-resources==0.0.0
+Pillow==8.4
+# pkg-resources==0.0.0
 protobuf==3.15.0
 pyasn1==0.4.7
 pyasn1-modules==0.2.7
 pytz==2019.3
-qrcode==6.1
+qrcode==7.0
 requests==2.22.0
-rsa==4.7
+rsa==4.0
 six==1.13.0
 uritemplate==3.0.0
-urllib3==1.26.5
+urllib3==1.22.0