Skip to content

make use of core PixelMap #104

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

Closed
wants to merge 1 commit into from
Closed

make use of core PixelMap #104

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
43 changes: 20 additions & 23 deletions adafruit_led_animation/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@

"""

import math

import _pixelmap
from . import MS_PER_SECOND, monotonic_ms
from .color import calculate_intensity

Expand Down Expand Up @@ -106,17 +105,26 @@ class PixelMap:

def __init__(self, strip, pixel_ranges, individual_pixels=False):
self._pixels = strip
self._ranges = pixel_ranges
if isinstance(pixel_ranges, list) or isinstance(pixel_ranges[0], list):
self._ranges = tuple(
tuple(item for item in sublist) for sublist in pixel_ranges
)

elif isinstance(pixel_ranges, tuple):
self._ranges = pixel_ranges

self.n = len(self._ranges)
if self.n == 0:
raise ValueError("A PixelMap must have at least one pixel defined")
self._individual_pixels = individual_pixels
self._expand_ranges()
self._map = _pixelmap.PixelMap(self._pixels, self._ranges)

def _expand_ranges(self):
if not self._individual_pixels:
self._ranges = [list(range(start, end)) for start, end in self._ranges]
self._ranges = tuple(
tuple(list(range(start, end))) for start, end in self._ranges
)
return
if isinstance(self._ranges[0], int):
self._ranges = [[n] for n in self._ranges]
Expand All @@ -125,21 +133,12 @@ def __repr__(self):
return "[" + ", ".join([str(self[x]) for x in range(self.n)]) + "]"

def _set_pixels(self, index, val):
for pixel in self._ranges[index]:
self._pixels[pixel] = val
self._map[index] = val

def __setitem__(self, index, val):
if isinstance(index, slice):
start, stop, step = index.indices(len(self._ranges))
length = stop - start
if step != 0:
length = math.ceil(length / step)
if len(val) != length:
raise ValueError("Slice and input sequence size do not match.")
for val_i, in_i in enumerate(range(start, stop, step)):
self._set_pixels(in_i, val[val_i])
else:
self._set_pixels(index, val)
if isinstance(index, int) and index < 0:
index += len(self)
self._map[index] = val

if self._pixels.auto_write:
self.show()
Expand All @@ -154,7 +153,7 @@ def __getitem__(self, index):
index += len(self)
if index >= self.n or index < 0:
raise IndexError
return self._pixels[self._ranges[index][0]]
return self._map[index]

def __len__(self):
return len(self._ranges)
Expand All @@ -177,9 +176,7 @@ def fill(self, color):

:param color: Color to fill all pixels referenced by this PixelMap definition with.
"""
for pixels in self._ranges:
for pixel in pixels:
self._pixels[pixel] = color
self._map.fill(color)

def show(self):
"""
Expand All @@ -192,11 +189,11 @@ def auto_write(self):
"""
auto_write from the underlying strip.
"""
return self._pixels.auto_write
return self._map.auto_write

@auto_write.setter
def auto_write(self, value):
self._pixels.auto_write = value
self._map.auto_write = value

@classmethod
def vertical_lines(cls, pixel_object, width, height, gridmap):
Expand Down