adding things

Author: tonlls

Config.py

@@ -25,9 +25,9 @@
 BAK_FILE = 'plantilla.png'
 BAK_PATH = path.join(RES_PATH, EDITIONS_FOLDER, EDITION, BAK_FILE)
 
-# FONT_FILE = 'Montserrat-Regular.ttf'
+FONT_FOLDER = 'fonts'
 FONT_FILE = 'SpaceMono-Bold.ttf'
-FONT_PATH = path.join(RES_PATH, FONT_FILE)
+FONT_PATH = path.join(RES_PATH, FONT_FOLDER, FONT_FILE)
 TYPE_FONT_SIZE = 18
 NAME_FONT_SIZE = 12
 FONT_COLOR = (0,0,0)

Model.py

@@ -10,8 +10,8 @@
 
 class Card:
 	QR_PIX_SIZE = 1
-	QR_POS = (1301, 172)
-	QR_SIZE = (723, 723)
+	QR_POS = (147, 10)
+	QR_SIZE = (100, 100)
 	QR_BORDER_SIZE = 0
 	TYPE_POS = (0, 155)
 	# NAME_POS = (500, 1250)
@@ -64,7 +64,7 @@ def get_data():
 
 class Guest(Assistant):
 	__ID = 1
-	__TYPE = 'INVITADO'
+	__TYPE = 'CONVIDAT'
 	__DATA = 'guests'
 
 	def __init__(self, name, mtype=None, has_qr=False):
@@ -94,7 +94,7 @@ def get_data(name=None):
 
 class Company(Assistant):
 	__ID = 1
-	__TYPE = ''
+	__TYPE = 'EMPRESSA'
 	__DATA = 'companies'
 
 	def __init__(self, name, image):
@@ -127,7 +127,7 @@ def get_data(name=None):
 class Volunteer(Assistant):
 	__ID = 1
 	__LOGO_PATH = os.path.join(Config.RES_PATH, 'editions', Config.EDITION, 'images', 'logogran.png')
-	__TYPE = 'VOLUNTARIA/O'
+	__TYPE = 'VOLUNTARI/A'
 	__DATA = 'volunteers'
 
 	def __init__(self, name):
@@ -156,7 +156,7 @@ def get_data(name=None):
 class Organizer(Assistant):
 	__ID = 1
 	__LOGO_PATH = os.path.join(Config.RES_PATH, 'editions', Config.EDITION, 'images', 'logogran.png')
-	__TYPE = 'ORGANIZACIÓN'
+	__TYPE = 'ORGANIZACIÓ'
 	__DATA = 'organizers'
 
 	def __init__(self, name):

Tools.py

@@ -38,6 +38,14 @@ def draw_text(image, text, pos, font, fill, centrate=True, mayus=True):
 	else:
 		ImageDraw.Draw(image).text(pos, text, font=font,fill=fill)
 
+def centrate_text_relative(image, text, font, fill, relative_pos, relative_size, mayus=True):
+	if mayus:
+		text = text.upper()
+	draw = ImageDraw.Draw(image)
+	w, h = draw.textsize(text, font=font)
+	x = relative_pos[0] + (relative_size[0] - w) / 2
+	y = relative_pos[1] + (relative_size[1] - h) / 2
+	ImageDraw.Draw(image).text((x, y), text, font=font,fill=fill)
 
 def scale(image, max_size, add_mask=True, method=Image.ANTIALIAS):
 	"""

main.py

@@ -18,4 +18,4 @@
 for u in users:
 	u.generate_card()
 	u.save()
-	break
+	# break

requirements.txt

@@ -16,13 +16,13 @@ grpcio==1.25.0
 httplib2==0.19.0
 idna==2.8
 msgpack==0.6.2
-Pillow==8.4
+Pillow==8.3.2
 # pkg-resources==0.0.0
 protobuf==3.15.0
 pyasn1==0.4.7
 pyasn1-modules==0.2.7
 pytz==2019.3
-qrcode==7.0
+qrcode==6.1
 requests==2.22.0
 rsa==4.0
 six==1.13.0