diff --git a/adafruit_progressbar.py b/adafruit_progressbar.py index c9fb609..6af3b19 100755 --- a/adafruit_progressbar.py +++ b/adafruit_progressbar.py @@ -119,17 +119,17 @@ def progress(self, value): if self._progress_val > value: # uncolorize range from width*value+margin to width-margin # from right to left - _prev_pixel = max(2, int(self._width * self._progress_val - 2)) - _new_pixel = max(int(self._width * value - 2), 2) + _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): + for _h in range(2, self.height - 2): self._bitmap[_w, _h] = 0 else: # 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)) + _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): + for _h in range(2, self.height - 2): self._bitmap[_w, _h] = 2 self._progress_val = value @@ -141,6 +141,20 @@ def fill(self): """ return self._palette[0] + @property + def width(self): + """The width of the progress bar. In pixels, includes the border. + + """ + return self._width + + @property + def height(self): + """The height of the progress bar. In pixels, includes the border. + + """ + return self._height + @fill.setter def fill(self, color): """Sets the fill of the progress bar. Can be a hex value for a color or ``None`` for