Refactor for duplicate code

Changes working for initial (incrementing) direction

Author: hugodahl

adafruit_progressbar/__init__.py

@@ -23,7 +23,7 @@
 
 # imports
 try:
-    from typing import Tuple, Union
+    from typing import Tuple, Union, List
 except ImportError:
     pass  # No harm if the module isn't located
 import displayio
@@ -476,6 +476,10 @@ def get_value_ratio(self, value: Union[int, float]) -> float:
     def _get_value_sizes(cls, _old_ratio: float, _new_ratio: float) -> Tuple[int, int]:
         return 0, 0
 
+    @classmethod
+    def _get_max_fill_size(cls) -> int:
+        return 0
+
     def _get_ratios(
         self, _old_value: Union[int, float], _new_value: Union[int, float]
     ) -> Tuple[float, float]:
@@ -487,11 +491,13 @@ def _adjust_size_for_range_limits(
         # If we have *ANY* value other than "zero" (minimum), we should
         #   have at least one element showing
         if _new_value_size == 0 and _new_value > self.minimum:
+            print(f"Adjust 1 up for {_new_value}")
             _new_value_size = 1
 
         # Conversely, if we have *ANY* value other than 100% (maximum),
         #   we should NOT show a full bar.
-        if _new_value_size == self.fill_height() and _new_value < self.maximum:
+        if _new_value_size == self._get_max_fill_size() and _new_value < self.maximum:
+            print(f"Adjust 1 down for {_new_value}")
             _new_value_size -= 1
 
         return _new_value_size
@@ -549,32 +555,38 @@ def _render(
         # Default values for increasing value
         _color = 2
         _incr = 1
-        _start = max(_old_value_size + _render_offset, _render_offset)
-        _end = max(_new_value_size, 0) + _render_offset
+        _start = max(_old_value_size, 0)
+        _end = max(_new_value_size, 0)
 
         if _old_value_size >= _new_value_size:
             # Override defaults to be decreasing
             _color = 0  # Clear
             _incr = -1  # Iterate range downward
-            _start = max(_old_value_size + _render_offset, _render_offset)
-            _end = max(_new_value_size + _render_offset, _render_offset) - 1
+            _start = max(_old_value_size, 0) - 1
+            _end = max(_new_value_size, 0) - 1
             # If we're setting to minimum, make sure we're clearing by
-            # starting one "bar" higher
+            #  starting one "bar" further
             if _new_value == self.minimum:
                 _start += 1
 
-        if self._invert_fill_direction():
-            _ref_pos = self.widget_height - 1
-            _end = _ref_pos - _end  # Those pesky "off-by-one" issues
-            _start = _ref_pos - _start
-            _incr = -1 if _start > _end else 1
-            _color = 0 if _old_value > _new_value else 2
+        #         if self._invert_fill_direction():
+        #             _ref_pos = self.widget_height - _render_offset
+        #             self._debug("Ref pos: ", _ref_pos)
+        #             _end = _ref_pos - _end  # Those pesky "off-by-one" issues
+        #             _start = _ref_pos - _start
+        #             _incr = -1 if _start > _end else 1
+        #             _color = 0 if _old_value > _new_value else 2
 
         vert_start, vert_end, vert_incr = self._get_vertical_fill(_start, _end, _incr)
         horiz_start, horiz_end, horiz_incr = self._get_horizontal_fill(
             _start, _end, _incr
         )
 
+        vert_start += _render_offset
+        vert_end += _render_offset
+        horiz_start += _render_offset
+        horiz_end += _render_offset
+
         for vertical_position in range(vert_start, vert_end, vert_incr):
             for horizontal_position in range(horiz_start, horiz_end, horiz_incr):
                 self._bitmap[horizontal_position, vertical_position] = _color

adafruit_progressbar/horizontalprogressbar.py

@@ -151,3 +151,6 @@ def _get_horizontal_fill(
 
     def _invert_fill_direction(self) -> bool:
         return self._direction == HorizontalFillDirection.RIGHT_TO_LEFT
+
+    def _get_max_fill_size(self):
+        return self.fill_width()

examples/progressbar_magtag_simpletest.py

@@ -9,7 +9,7 @@
 import board
 import displayio
 import digitalio
-from adafruit_progressbar.progressbar import ProgressBar
+from adafruit_progressbar.progressbar import HorizontalProgressBar
 
 # use built in display (PyPortal, PyGamer, PyBadge, CLUE, etc.)
 # see guide for setting up external displays (TFT / OLED breakouts, RGB matrices, etc.)
@@ -34,7 +34,7 @@
 y = display.height // 3
 
 # Create a new progress_bar object at (x, y)
-progress_bar = ProgressBar(
+progress_bar = HorizontalProgressBar(
     x, y, BAR_WIDTH, BAR_HEIGHT, 1.0, bar_color=0x666666, outline_color=0xFFFFFF
 )
 

examples/progressbar_matrixportal.py

@@ -16,6 +16,8 @@
 
 # CONTROLS
 
+import digitalio
+
 from adafruit_progressbar.horizontalprogressbar import (
     HorizontalProgressBar,
     HorizontalFillDirection,
@@ -72,7 +74,12 @@
 
 # Another progress bar, with explicit range and fill from the right
 ranged_bar = HorizontalProgressBar(
-    (2, 20), (40, 8), value=40, min_value=0, max_value=100
+    (2, 20),
+    (40, 8),
+    value=40,
+    min_value=0,
+    max_value=100,
+    direction=HorizontalFillDirection.RIGHT_TO_LEFT,
 )
 group.insert(1, ranged_bar)
 
@@ -107,22 +114,38 @@
 
 group.insert(3, countdown_bar)
 # group.insert(0, countdown_bar)
+
+print("Progress bars added. Starting demo...")
+
+print("Using countdown bar")
+
 for timer in range(countdown_bar.maximum, countdown_bar.minimum, -1):
     bar_color_to_set = (0x20 * (6 - timer) + 20, (0x20 * (timer - 1)) + 20, 0x10)
     countdown_bar.bar_color = bar_color_to_set
     countdown_bar.value = timer
     time.sleep(1)
 
+print("Removing countdown bar")
+
 countdown_bar.value = 0
 group.remove(countdown_bar)
 
 progress_bar_value = 0.0
 progress_bar_incr = 3.0
 
+button1 = digitalio.DigitalInOut(board.BUTTON_UP)
+button1.switch_to_input(digitalio.Pull.UP)
+button2 = digitalio.DigitalInOut(board.BUTTON_DOWN)
+button2.switch_to_input(digitalio.Pull.UP)
+
+
 print("Start forever loop")
 while True:
 
+    print("Setting progress bar value to", progress_bar_value)
+
     progress_bar.value = progress_bar_value
+    ranged_bar.value = progress_bar_value
     progress_bar_value += progress_bar_incr
 
     if progress_bar_value > progress_bar.maximum:
@@ -133,4 +156,11 @@
         progress_bar_value = progress_bar.minimum
         progress_bar_incr *= -1
 
+    #     button_pressed = False
+    #     while False == button_pressed:
+    #         button_pressed = button_pressed or not (button1.value and button2.value)
+    #         time.sleep(0.1)
+
+    #     print("Step")
+    button_pressed = False
     time.sleep(0.5)