Mirrors/grow-python
1
0
Fork 0
mirror of https://github.com/pimoroni/grow-python synced 2025-10-25 15:19:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix text alignment, output channel settings

Browse Source
This commit is contained in:
Phil Howard
2020-06-01 13:06:12 +01:00
parent 72cd4fa97c
commit 289d7358d2
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
examples/display.py
View File

@@ -61,7 +61,6 @@ class Channel:
def update_from_yml(self, config): def update_from_yml(self, config):
if config is not None: if config is not None:
print(config)
self.pump_speed = config.get("pump_speed", self.pump_speed) self.pump_speed = config.get("pump_speed", self.pump_speed)
self.pump_time = config.get("pump_time", self.pump_time) self.pump_time = config.get("pump_time", self.pump_time)
self.alarm_level = config.get("alarm_level", self.alarm_level) self.alarm_level = config.get("alarm_level", self.alarm_level)
@@ -73,6 +72,15 @@ class Channel:
pass pass
def __str__(self):
return """Channel: {channel}
Water level: {water_level}
Alarm level: {alarm_level}
Pump speed: {pump_speed}
Pump time: {pump_time}
Delay: {watering_delay}
""".format(**self.__dict__)
def water(self): def water(self):
if time.time() - self.last_dose > self.watering_delay: if time.time() - self.last_dose > self.watering_delay:
self.pump.dose(self.pump_speed, self.pump_time) self.pump.dose(self.pump_speed, self.pump_time)
@@ -104,7 +112,7 @@ class Channel:
draw.rectangle((x, 2, x + 15, 17), self.indicator_color(c, self.label_colours) if active else (129, 129, 129)) draw.rectangle((x, 2, x + 15, 17), self.indicator_color(c, self.label_colours) if active else (129, 129, 129))
if selected: if selected:
selected_x = x selected_x = x - 2
draw.rectangle((selected_x, 0, selected_x + 19, 20), self.indicator_color(c, self.label_colours) if active else (129, 129, 129)) draw.rectangle((selected_x, 0, selected_x + 19, 20), self.indicator_color(c, self.label_colours) if active else (129, 129, 129))
# TODO: replace with graphic, since PIL has no anti-aliasing # TODO: replace with graphic, since PIL has no anti-aliasing
@@ -116,7 +124,9 @@ class Channel:
fill=self.indicator_color(c, self.label_colours) if active else (129, 129, 129)) fill=self.indicator_color(c, self.label_colours) if active else (129, 129, 129))
# TODO: replace number text with graphic # TODO: replace number text with graphic
draw.text((x, 2), "{}".format(self.channel), font=font, fill=(255, 255, 255))
tw, th = font.getsize("{}".format(self.channel))
draw.text((x + int(math.ceil(8 - (tw / 2.0))), 2), "{}".format(self.channel), font=font, fill=(255, 255, 255))
def update(self): def update(self):
sat = self.sensor.saturation sat = self.sensor.saturation
@@ -255,11 +265,19 @@ def main():
settings_file = sys.argv[1] settings_file = sys.argv[1]
settings_file = pathlib.Path(settings_file) settings_file = pathlib.Path(settings_file)
if settings_file.is_file(): if settings_file.is_file():
config = yaml.safe_load(open(settings_file)) try:
config = yaml.safe_load(open(settings_file))
except yaml.parser.ParserError as e:
raise yaml.parser.ParserError("Error parsing settings file: {} ({})".format(settings_file, e))
for channel in channels: for channel in channels:
ch = config.get("channel{}".format(channel.channel), None) ch = config.get("channel{}".format(channel.channel), None)
channel.update_from_yml(ch) channel.update_from_yml(ch)
print("Channels:")
for channel in channels:
print(channel)
while True: while True:
update() update()
render() render()