Skip to content

Commit 48b512a

Browse files
authored
Merge pull request #60 from FoamyGuy/cartesian_vectorio_fix
fix cartesian for new vectorio API
2 parents 5daad48 + a1d19d8 commit 48b512a

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

adafruit_displayio_layout/widgets/cartesian.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ def __init__(
314314

315315
self._pointer = None
316316
self._circle_palette = None
317-
self._pointer_vector_shape = None
318317
self.plot_line_point = None
319318

320319
@staticmethod
@@ -449,18 +448,14 @@ def _draw_ticks(self) -> None:
449448
)
450449

451450
def _draw_pointers(self, x: int, y: int) -> None:
452-
self._pointer = vectorio.Circle(self._pointer_radius)
453-
self._circle_palette = displayio.Palette(2)
454-
self._circle_palette.make_transparent(0)
455-
self._circle_palette[1] = self._pointer_color
456-
457-
self._pointer_vector_shape = vectorio.VectorShape(
458-
shape=self._pointer,
459-
pixel_shader=self._circle_palette,
460-
x=x,
461-
y=y,
451+
452+
self._circle_palette = displayio.Palette(1)
453+
self._circle_palette[0] = self._pointer_color
454+
self._pointer = vectorio.Circle(
455+
radius=self._pointer_radius, x=x, y=y, pixel_shader=self._circle_palette
462456
)
463-
self.append(self._pointer_vector_shape)
457+
458+
self.append(self._pointer)
464459

465460
def update_pointer(self, x: int, y: int) -> None:
466461
"""updater_pointer function
@@ -480,8 +475,8 @@ def update_pointer(self, x: int, y: int) -> None:
480475
self._draw_pointers(local_x, local_y)
481476
self._update_line = False
482477
else:
483-
self._pointer_vector_shape.x = local_x
484-
self._pointer_vector_shape.y = local_y
478+
self._pointer.x = local_x
479+
self._pointer.y = local_y
485480

486481
def _set_plotter_line(self) -> None:
487482
self.plot_line_point = []

0 commit comments

Comments
 (0)