Skip to content

Performance boost and simpletest update #8

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 4 commits into from
Jul 20, 2020
Merged

Performance boost and simpletest update #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd1c9a3
update the progress method to only fill pixels that need to be change…
FoamyGuy Jul 18, 2020
81be954
remove debugging print that was accidentally left in
FoamyGuy Jul 18, 2020
ace28ff
update simpletest
FoamyGuy Jul 18, 2020
8921a7c
count by 1 instead of 5 in the simpletest
FoamyGuy Jul 18, 2020
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
11 changes: 8 additions & 3 deletions adafruit_progressbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,17 @@ def progress(self, value):
), "Progress value must be a floating point value."
if self._progress_val > value:
# uncolorize range from width*value+margin to width-margin
for _w in range(int(value * self._width + 2), self._width - 2):
# from right to left
_prev_pixel = max(2, int(self._width * self._progress_val - 2))
_new_pixel = max(int(self._width * value - 2), 2)
for _w in range(_prev_pixel, _new_pixel - 1, -1):
for _h in range(2, self._height - 2):
self._bitmap[_w, _h] = 0
else:
# fully fill progress bar color
for _w in range(2, self._width * value - 2):
# fill from the previous x pixel to the new x pixel
_prev_pixel = max(2, int(self._width * self._progress_val - 3))
_new_pixel = min(int(self._width * value - 2), int(self._width * 1.0 - 3))
for _w in range(_prev_pixel, _new_pixel + 1):
for _h in range(2, self._height - 2):
self._bitmap[_w, _h] = 2
self._progress_val = value
Expand Down
14 changes: 7 additions & 7 deletions examples/progressbar_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@

current_progress = 0.0
while True:
while current_progress <= 1.0:
print("Progress: {}%".format(current_progress * 100))
progress_bar.progress = current_progress
current_progress += 0.05
if current_progress >= 1.0:
current_progress = 0.0
time.sleep(0.01)
for current_progress in range(0, 21):
Copy link

Choose a reason for hiding this comment

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

I don't entirely understand the range ending in 21 as 100% It's more intuitive to me for 100% to be... well... 100 :)

Copy link

Choose a reason for hiding this comment

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

Ok, I get what you are doing now that i've read through it a few times. I think the prior example was more intuitive to a newbie (myself) as it made me think in percentages but it does expose the float issue. Maybe leave both in as examples?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change allowed us to count by integers instead of floating point numbers. There was some more discussion about it in the #circuitpython channel on discord this morning if you are interested in learning more about it. http://adafru.it/discord

I think you are right though it would be more clear if it ended on 100. however if it counts by 1 it will be somewhat slower than it is now. we can step by 5 in the range loop though to get the same speed. I'll make this change too. Thank you.

Copy link

Choose a reason for hiding this comment

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

Being just the example, I think the slower counting to 100 makes more sense. Maybe include a comment mentioning performance? Thank you for fixing this!

print("Progress: {}%".format(current_progress * 0.05))
Copy link

@gfbarros gfbarros Jul 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

This outputs 0 -> 1%. I changed it to
print("Progress: {}%".format(current_progress * 0.05 * 100))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch thank you. I'll push a new commit to fix this soon.

progress_bar.progress = current_progress * 0.05
time.sleep(0.02)
time.sleep(0.3)
progress_bar.progress = 0.0
time.sleep(0.3)