Skip to content

Add cartesian widget #22

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 39 commits into from
Apr 5, 2021
Merged

Add cartesian widget #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3133990
Initial changes to include cartesian widget
jposada202020 Mar 21, 2021
e5304e6
Moving _blip_rotate_scale to __init__ to avoid code repetition.
jposada202020 Mar 21, 2021
45bd920
inclusion the ability to select widget x,y coordinates, update functi…
jposada202020 Mar 21, 2021
e8e67c0
# TODO Make axes, separate from data [X]
jposada202020 Mar 22, 2021
e4aeb41
# TODO Make axes, separate from data [X] - Import Order
jposada202020 Mar 22, 2021
7f4e1b1
# TODO Make axes, separate from data [X] - Black
jposada202020 Mar 22, 2021
057a96c
# TODO Replace with drawline/vectorio [X]
jposada202020 Mar 22, 2021
185e539
# TODO Make a rectangle function [√]
jposada202020 Mar 22, 2021
2c1a307
# TODO Make a rectangle function [√] - API Docs
jposada202020 Mar 22, 2021
5cecb03
# TODO Make a rectangle function [√] - API Docs - End …
jposada202020 Mar 22, 2021
b129077
# TODO Make a rectangle function [√] - board.Display r…
jposada202020 Mar 22, 2021
a36b27c
# TODO Include functions to equal space ticks [√]
jposada202020 Mar 22, 2021
5af4bf2
# TODO Make labels and text [√]
jposada202020 Mar 22, 2021
66c7fcf
# TODO Make labels and text [√] - import order
jposada202020 Mar 22, 2021
57dd04d
# TODO Make Styles applicable [√]
jposada202020 Mar 23, 2021
0e39c39
# UPDATE Ticks/Subticks Logic-Advanced Example [√]
jposada202020 Mar 23, 2021
edccd8a
# UPDATE widget group and coordinates [√]
jposada202020 Mar 23, 2021
e65ab90
# UPDATE scale and tickers, plot limits [√]
jposada202020 Mar 24, 2021
b2104ea
# UPDATE scale and tickers, plot limits [√]
jposada202020 Mar 24, 2021
c692ee8
Merge branch 'adafruit_main' into cartesian
jposada202020 Mar 24, 2021
b53cbfc
# TODO Pointer: (0, 0) AXISX vs AXISY [ ]
jposada202020 Mar 25, 2021
ff46af0
# TODO major_tick_stroke value is ignored [√]
jposada202020 Mar 25, 2021
b6f6b5b
Merge branch 'adafruit_main' into cartesian
jposada202020 Mar 25, 2021
95ac520
# TODO Pointer: (0, 0) AXISX vs AXISY [√]
jposada202020 Mar 25, 2021
dc34b07
# UPDATE DOCS [√]
jposada202020 Mar 25, 2021
ecf5036
# UPDATE: End of license Files [√]
jposada202020 Mar 25, 2021
3b5d1f2
# UPDATE: Remove Duplicate graph [√]
jposada202020 Mar 25, 2021
d35ffd6
# UPDATE: spaces [√]
jposada202020 Mar 25, 2021
7506b24
# UPDATE: spaces [√]
jposada202020 Mar 25, 2021
40bb7a2
# UPDATE: docsstrings [√]
jposada202020 Mar 25, 2021
1377f4a
# UPDATE: docstrings [√]
jposada202020 Mar 25, 2021
2db1bbf
# UPDATE: Corrections. Corner Bitmap, Simpletest [√]
jposada202020 Mar 26, 2021
636b449
# UPDATE: for loop inside while [√]
jposada202020 Mar 28, 2021
e05033d
# UPDATE: adding nudge parameter, update docs, and function [√]
jposada202020 Mar 28, 2021
c691045
# UPDATE: correcting ``nudge_x``, ``nudge_y`` [√]
jposada202020 Mar 28, 2021
a0d98ae
# TODO: Including nudge in th update function [√]
jposada202020 Mar 30, 2021
3d6ded6
Merge remote-tracking branch 'Adafruit/main' into cartesian
jposada202020 Mar 30, 2021
b07162c
# Correcting the off bit dimension
jposada202020 Apr 3, 2021
001b4ef
Correcting example to remove the reference to the style library
jposada202020 Apr 5, 2021
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
19 changes: 19 additions & 0 deletions adafruit_displayio_layout/widgets/cartesian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,24 @@ def __init__(
self._screen_palette[4] = 0xFFFFFF
self._screen_palette[5] = self._background_color

self._corner_bitmap = displayio.Bitmap(10, 10, 5)
Copy link
Contributor Author

@jposada202020 jposada202020 Mar 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FoamyGuy Here is the inclusion to solve the corner issue, I tested with different strokes, however a second pair of eyes would not hurt

rectangle_helper(
0,
0,
self._axes_line_thickness,
self._axes_line_thickness,
self._corner_bitmap,
2,
self._screen_palette,
)

self._corner_tilegrid = displayio.TileGrid(
self._corner_bitmap,
pixel_shader=self._screen_palette,
x=-self._axes_line_thickness,
y=self.height,
)

self._axesx_tilegrid = displayio.TileGrid(
self._axesx_bitmap,
pixel_shader=self._screen_palette,
Expand Down Expand Up @@ -274,6 +292,7 @@ def __init__(
self.append(self._axesx_tilegrid)
self.append(self._axesy_tilegrid)
self.append(self._screen_tilegrid)
self.append(self._corner_tilegrid)

self._update_line = True

Expand Down
7 changes: 2 additions & 5 deletions examples/displayio_layout_cartesian_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
posx = 0
posy = 0

while True:
my_plane.update_pointer(posx, posy)
display.show(my_group)
for i in range(0, 90, 2):
my_plane.update_pointer(i, i)
time.sleep(0.5)
posx = posx + 2
posy = posy + 2