Skip to content

use filename for OnDiskBitmap #41

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
Dec 7, 2021
Merged

use filename for OnDiskBitmap #41

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
36 changes: 17 additions & 19 deletions adafruit_slideshow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
====================================================
CircuitPython helper library for displaying a slideshow of images on a display.

* Author(s): Kattni Rembor, Carter Nelson, Roy Hooper, Melissa LeBlanc-Williams
* Author(s): Kattni Rembor, Carter Nelson, Rose Hooper, Melissa LeBlanc-Williams

Implementation Notes
--------------------
Expand Down Expand Up @@ -244,7 +244,7 @@ def _check_json_file(file):
self._v_align = v_align

self._current_slide_index = -1
self._slide_file = None
self._file_name = None
self._brightness = 0.5

# Setup the display
Expand Down Expand Up @@ -330,13 +330,14 @@ def _fade_down(self):
self._set_backlight(self.brightness * i / steps)
time.sleep(0.01)

def _create_label(self, file):
def _create_label(self, file_name):
# pylint: disable=too-many-branches
"""Creates and returns a label from a file object that contains
valid valid json describing the text to use.
See: examples/sample_text_slide.json
"""
json_data = json.loads(file.read())
with open(file_name, "rb") as file:
json_data = json.loads(file.read())
_scale = 1
if "scale" in json_data:
_scale = int(json_data["scale"])
Expand Down Expand Up @@ -398,11 +399,10 @@ def update(self):
# pylint: disable=too-many-branches, too-many-statements
def advance(self):
"""Displays the next image. Returns True when a new image was displayed, False otherwise."""
if self._slide_file:
if self._file_name:
self._fade_down()
self._group.pop()
self._slide_file.close()
self._slide_file = None
self._file_name = None

self._current_slide_index += self.direction

Expand All @@ -423,17 +423,15 @@ def advance(self):
self._current_slide_index -= slide_count
self._reorder_slides()

file_name = self._file_list[self._current_slide_index]
with open(file_name, "rb") as self._slide_file:
if file_name.endswith(".bmp"):
try:
odb = displayio.OnDiskBitmap(self._slide_file)
except ValueError:
self._slide_file.close()
self._slide_file = None
del self._file_list[self._current_slide_index]
elif file_name.endswith(".json"):
lbl = self._create_label(self._slide_file)
self._file_name = self._file_list[self._current_slide_index]
if self._file_name.endswith(".bmp"):
try:
odb = displayio.OnDiskBitmap(self._file_name)
except ValueError:
del self._file_list[self._current_slide_index]
self._file_name = None
elif self._file_name.endswith(".json"):
lbl = self._create_label(self._file_name)

if not odb and not lbl:
raise RuntimeError("No valid images or text json files")
Expand Down Expand Up @@ -464,9 +462,9 @@ def advance(self):
if lbl:
self._group.append(lbl)

self._fade_up()
if hasattr(self._display, "refresh"):
self._display.refresh()
self._fade_up()
self._img_start = time.monotonic()

return True
Expand Down