m.giller/E-Paper-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Improved default font size integration

Browse source
This commit is contained in:
Maximilian Giller 2019-04-17 17:23:41 +02:00
parent 95cee6287e
commit 7526c47735
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Calendar/DayRowDesign.py
View file

@ -3,7 +3,7 @@ from TextDesign import TextDesign
from settings import week_starts_on, owm_paid_subscription from settings import week_starts_on, owm_paid_subscription
from DesignEntity import DesignEntity from DesignEntity import DesignEntity
from datetime import datetime from datetime import datetime
from Assets import weathericons, wpath, fonts, colors from Assets import weathericons, wpath, fonts, colors, defaultfontsize
from SingelDayEventListDesign import SingelDayEventListDesign from SingelDayEventListDesign import SingelDayEventListDesign
daynumber_y_size = (1, 0.65) daynumber_y_size = (1, 0.65)
@ -15,7 +15,7 @@ weathericon_ypos = 0.1
weathericon_height = 1 - 2 * weathericon_ypos weathericon_height = 1 - 2 * weathericon_ypos
eventlist_xpadding = 5 eventlist_xpadding = 5
eventlist_ypos = 0.1 eventlist_ypos = 0.1
eventlist_y_fontsize = 0.2 eventlist_y_fontsize = 0.2 * defaultfontsize / 14
font = fonts["light"] font = fonts["light"]

28
Calendar/WeatherColumnDesign.py
View file

@ -8,11 +8,8 @@ from settings import hours
icon_xpos = 0.1 icon_xpos = 0.1
icon_x_ypos = 0 icon_x_ypos = 0
icon_width = 1 - 2 * icon_xpos icon_width = 1 - 2 * icon_xpos
info_x_height = icon_width * 0.3
info_x_ypos = icon_x_ypos + icon_width info_x_ypos = icon_x_ypos + icon_width
fontsize_static = defaultfontsize fontsize_static = defaultfontsize
numbers_x_ypos = icon_x_ypos + icon_width + info_x_height + 0.2
numbers_x_ypadding = 0.05
max_symbol_y_width = 0.15 max_symbol_y_width = 0.15
class WeatherColumnDesign (DesignEntity): class WeatherColumnDesign (DesignEntity):
@ -27,35 +24,24 @@ class WeatherColumnDesign (DesignEntity):
return return
self.__draw_icon__(self.forecast.icon) self.__draw_icon__(self.forecast.icon)
self.__draw_info__(self.forecast.short_description) self.__draw_infos__(self.forecast)
self.__draw_numbers_text__(self.forecast)
def __draw_info__ (self, info): def __draw_infos__ (self, forecast):
height = info_x_height * self.size[0]
ypos = info_x_ypos * self.size[0]
size = (self.size[0], height)
pos = (0, ypos)
txt = TextDesign(size, text=info, fontsize=fontsize_static, horizontalalignment="center")
txt.pos = pos
self.draw_design(txt)
def __draw_numbers_text__ (self, forecast):
temperature = forecast.air_temperature + " " + self.__get_unit__(("°C", "°F")) temperature = forecast.air_temperature + " " + self.__get_unit__(("°C", "°F"))
humidity = forecast.air_humidity + "%" humidity = forecast.air_humidity + "%"
windspeed = forecast.wind_speed + " " + self.__get_unit__(("km/h", "mph")) windspeed = forecast.wind_speed + " " + self.__get_unit__(("km/h", "mph"))
numbers_list = [ [ temperature ], numbers_list = [ [ forecast.short_description ],
[ temperature ],
[ humidity ], [ humidity ],
[ windspeed ] ] [ windspeed ] ]
fontsize = fontsize_static ypos = info_x_ypos * self.size[0]
ypos = numbers_x_ypos * self.size[0]
pos = (0, ypos) pos = (0, ypos)
size = (self.size[0], self.size[1] - pos[1]) size = (self.size[0], self.size[1] - pos[1])
line_spacing = (size[1] - len(numbers_list) * fontsize) / len(numbers_list) / 1.3 line_spacing = (size[1] - len(numbers_list) * fontsize_static) / (len(numbers_list) + 1)
table = TableTextDesign(size, numbers_list, fontsize=fontsize, line_spacing=line_spacing, column_horizontal_alignments=[ "center" ], max_col_size=[ size[0] ], truncate_rows=False, truncate_text=False) table = TableTextDesign(size, numbers_list, fontsize=fontsize_static, line_spacing=line_spacing, column_horizontal_alignments=[ "center" ], max_col_size=[ size[0] ], truncate_text=False)
table.pos = pos table.pos = pos
self.draw_design(table) self.draw_design(table)