Continue refactor to include vertical progressbar

Author: hugodahl

adafruit_progressbar/__init__.py

@@ -139,6 +139,31 @@ def y(self):
         """The vertical (y) position of the top-left corner of the widget."""
         return self._position[1]
 
+    @property
+    def outline_color(self):
+        """Returns the currently configured value for the color of the
+        outline (border) of the widget."""
+        return self._palette[1]
+
+    @property
+    def fill(self):
+        """The fill of the progress bar. Can be a hex value for a color or ``None`` for
+        transparent.
+        """
+        return self._palette[0]
+
+    @fill.setter
+    def fill(self, color):
+        """Sets the fill of the progress bar. Can be a hex value for a color or ``None`` for
+        transparent.
+        """
+        if color is None:
+            self._palette[2] = 0
+            self._palette.make_transparent(0)
+        else:
+            self._palette[2] = color
+            self._palette.make_opaque(0)
+
     @property
     def progress(self):
         """Gets the current displayed value of the widget."""
@@ -165,7 +190,7 @@ def progress(self, value):
 
     @property
     def range(self):
-        """The range which can be handled as a tuple (min,max)"""
+        """The range which can be handled as a Tuple(min,max)"""
         return self._range
 
     @property

adafruit_progressbar/progressbar.py

@@ -117,12 +117,12 @@ def render(self, _previous_value, _new_value, _progress_value) -> None:
         :type _progress_value: float
         :rtype None:
         """
-        #         print("Calling 'super().render()' before our own code")
-        #         super().render()
-        #        print("Calling own 'render()' code")
+
+        if _previous_value == _new_value:
+            return  # Do nothing if there's nothing to update
 
         if _previous_value > _new_value:
-            # uncolorize range from width*value+margin to width-margin
+            # Remove color in range from width*value+margin to width-margin
             # from right to left
             _prev_pixel = max(2, int(self.widget_width * self.progress - 2))
             _new_pixel = max(int(self.widget_width * _new_value - 2), 2)

adafruit_progressbar/verticalprogressbar.py

@@ -1,5 +1,4 @@
-# Copyright (C) 2021 Hugo Dahl for Adafruit Industries
-# Copyright (c) 2020 Brent Rubell for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2020-2021 Brent Rubell for Adafruit Industries, Hugo Dahl
 #
 # SPDX-License-Identifier: MIT
 
@@ -175,7 +174,6 @@ def _draw_outline(self):
     def progress(self):
         """The percentage of the progress bar expressed as a
         floating point number.
-
         """
         return self._progress_val
 
@@ -210,7 +208,7 @@ def render(self, old_value, new_value, progress):
         :return: None
         :rtype: None
         """
-        _padding = 1
+        _padding = 0
 
         print(f"Drawing a visual of progress value {progress}")
 
@@ -230,8 +228,8 @@ def render(self, old_value, new_value, progress):
             self.height - (2 * _padding) - _border_size
         )  # Count padding on the top and bottom
 
-        _prev_value_size = int(old_value * _fill_width)
-        _new_value_size = int(new_value * _fill_width)
+        _prev_value_size = int(old_value * _fill_height)
+        _new_value_size = int(new_value * _fill_height)
 
         # If we have *ANY* value other than "zero" (minimum), we should
         #   have at least one element showing
@@ -241,7 +239,7 @@ def render(self, old_value, new_value, progress):
         # Conversely, if we have *ANY* value other than 100% (maximum),
         #   we should NOT show a full bar.
 
-        if _new_value_size == _fill_width and new_value < self._max:
+        if _new_value_size == _fill_height and new_value < self._max:
             _new_value_size -= 1
 
         # Default values for increasing value
@@ -259,23 +257,23 @@ def render(self, old_value, new_value, progress):
             _start = max(_prev_value_size, _start_offset)
             _end = max(_new_value_size, _start_offset)
         elif _prev_value_size == _new_value_size:
-            return  # No action to take. Return
+            return  # The pre-defined values above the start
+            # of the if block are already correct.
         else:
-            pass
+            pass  # No value change. Return.
 
         # Because range() is ( from-include, to-exclude )...
         _vert_start = _border_thickness + _padding
         _vert_end = _vert_start + _fill_height
 
-        for h in range(_vert_start, _vert_end):
-            for w in range(_start, _end, _incr):
+        for h in range(_start, _end, _incr):
+            for w in range(_start_offset, _fill_width):
                 self._bitmap[w, h] = _color
 
     @property
     def fill(self):
-        """The fill of the progress bar. Can be a hex value for a color or ``None`` for
-        transparent.
-
+        """The fill of the progress bar. Can be a hex value for a color or
+        ``None`` for transparent.
         """
         return self._palette[0]
 
@@ -291,9 +289,8 @@ def height(self):
 
     @fill.setter
     def fill(self, color):
-        """Sets the fill of the progress bar. Can be a hex value for a color or ``None`` for
-        transparent.
-
+        """Sets the fill of the progress bar. Can be a hex value for a color or
+        ``None`` for transparent.
         """
         if color is None:
             self._palette[2] = 0