From ed04beecb7ee224367f0935185cc0be7e1adbf67 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Fri, 5 Jan 2024 22:58:03 -0500 Subject: [PATCH] Move speedoo units below value; make value bigger --- py/hexagram/speedo.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/py/hexagram/speedo.py b/py/hexagram/speedo.py index 649b14f..07a14dd 100644 --- a/py/hexagram/speedo.py +++ b/py/hexagram/speedo.py @@ -42,23 +42,23 @@ class Speedo(Dial): for speed in range(0, int(self.max_value)+1, 20): self.draw_number(cr, 0.68, speed, "%d" % int(speed)) - def draw_fg(self, cr: cairo.Context): - super().draw_fg(cr) - - text = "%d mph" % self.value - + def _draw_text(self, cr: cairo.Context, x: float, y: float, text: str, size: float): cr.select_font_face("Muli", cairo.FontSlant.ITALIC, cairo.FontWeight.BOLD) - cr.set_font_size(self.radius * 0.15) + cr.set_font_size(self.radius * size) cr.set_source_rgb(1, 0.4, 1) extents = cr.text_extents(text) width = extents[2] - extents[0] height = extents[3] - extents[1] - cr.move_to(self.x - width / 2, - self.y + height / 4) - + cr.move_to(x - width / 2, y + height / 4) cr.show_text(text) + + def draw_fg(self, cr: cairo.Context): + super().draw_fg(cr) + + self._draw_text(cr, self.x, self.y, "%d" % self.value, 0.25) + self._draw_text(cr, self.x, self.y + self.radius * 0.16, 'mph', 0.1)