Skip to content

PyPortal Electioncal US: Update for CP7 #1724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2021
Merged

PyPortal Electioncal US: Update for CP7 #1724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions PyPortal_Electioncal_US/electioncal_graphics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@

class Electioncal_Graphics(displayio.Group):
def __init__(self, root_group, *, am_pm=True):
super().__init__(max_size=2)
super().__init__()
self.am_pm = am_pm
root_group.append(self)
self._icon_group = displayio.Group(max_size=1)
self._icon_group = displayio.Group()
self.append(self._icon_group)
self._text_group = displayio.Group(max_size=9)
self._text_group = displayio.Group()
self.append(self._text_group)

self._icon_sprite = None
self._icon_file = None
self._icon_file = None # Remove when CircuitPython 6 support is dropped
self.set_icon(cwd+"/icons/electioncal.bmp")

self.small_font = bitmap_font.load_font(small_font)
Expand All @@ -29,38 +29,38 @@ def __init__(self, root_group, *, am_pm=True):
self.small_font.load_glyphs(glyphs)
self.medium_font.load_glyphs(glyphs)

self.date_text = Label(self.small_font, max_glyphs=21)
self.date_text = Label(self.small_font)
self.date_text.x = 15
self.date_text.y = 195
self.date_text.color = 0xFFFFFF
self._text_group.append(self.date_text)

self.url_text = Label(self.small_font, max_glyphs=35)
self.url_text = Label(self.small_font)
self.url_text.x = 15
self.url_text.y = 220
self.url_text.color = 0xFFFFFF
self._text_group.append(self.url_text)
self.url_text.text = "Visit us at https://electioncal.us"

self.state_text = Label(self.small_font, max_glyphs=60)
self.state_text = Label(self.small_font)
self.state_text.x = 15
self.state_text.y = 10
self.state_text.color = 0xFFFFFF
self._text_group.append(self.state_text)

self.election_date_text = Label(self.medium_font, max_glyphs=11)
self.election_date_text = Label(self.medium_font)
self.election_date_text.x = 15
self.election_date_text.y = 60
self.election_date_text.color = 0xFFFFFF
self._text_group.append(self.election_date_text)

self.election_name_text = Label(self.small_font, max_glyphs=60)
self.election_name_text = Label(self.small_font)
self.election_name_text.x = 15
self.election_name_text.y = 95
self.election_name_text.color = 0xFFFFFF
self._text_group.append(self.election_name_text)

self.election_name_text_line2 = Label(self.small_font, max_glyphs=60)
self.election_name_text_line2 = Label(self.small_font)
self.election_name_text_line2.x = 15
self.election_name_text_line2.y = 120
self.election_name_text_line2.color = 0xFFFFFF
Expand Down Expand Up @@ -137,15 +137,19 @@ def set_icon(self, filename):

if not filename:
return # we're done, no icon desired

# CircuitPython 6 & 7 compatible
if self._icon_file:
self._icon_file.close()
self._icon_file = open(filename, "rb")
icon = displayio.OnDiskBitmap(self._icon_file)
try:
self._icon_sprite = displayio.TileGrid(icon,
pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()))
except TypeError:
self._icon_sprite = displayio.TileGrid(icon,
pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()),
position=(0,0))
self._icon_group.append(self._icon_sprite)
self._icon_sprite = displayio.TileGrid(
icon,
pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())
)

# # CircuitPython 7+ compatible
# icon = displayio.OnDiskBitmap(filename)
# self._icon_sprite = displayio.TileGrid(icon, pixel_shader=icon.pixel_shader)

self._icon_group.append(self._icon_sprite)