From 9a73454013d34b39c16d31941b0460d5fb47795d Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 07:44:51 -0500 Subject: [PATCH 01/22] Added getter/setter for font to ensure proper screen update when font is changed --- adafruit_display_text/label.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) mode change 100644 => 100755 adafruit_display_text/label.py diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py old mode 100644 new mode 100755 index 24ef7b4..4d82588 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -22,23 +22,18 @@ """ `adafruit_display_text.label` ==================================================== - Displays text labels using CircuitPython's displayio. - * Author(s): Scott Shawcroft - Implementation Notes -------------------- - **Hardware:** - **Software and Dependencies:** - * Adafruit CircuitPython firmware for the supported boards: https://github.com/adafruit/circuitpython/releases - """ +print('loading label.py Yay!') + import displayio __version__ = "0.0.0-auto.0" @@ -50,7 +45,6 @@ class Label(displayio.Group): properties will be the left edge of the bounding box, and in the center of a M glyph (if its one line), or the (number of lines * linespacing + M)/2. That is, it will try to have it be center-left as close as possible. - :param Font font: A font class that has ``get_bounding_box`` and ``get_glyph``. Must include a capital M for measuring character size. :param str text: Text to display @@ -77,7 +71,7 @@ def __init__( max_glyphs = len(text) super().__init__(max_size=max_glyphs, **kwargs) self.width = max_glyphs - self.font = font + self._font = font self._text = None self._anchor_point = (0, 0) self.x = x @@ -94,7 +88,7 @@ def __init__( self._transparent_background = True self.palette[1] = color - bounds = self.font.get_bounding_box() + bounds = self._font.get_bounding_box() self.height = bounds[1] self._line_spacing = line_spacing self._boundingbox = None @@ -107,9 +101,11 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals y = 0 i = 0 old_c = 0 + bounds = self._font.get_bounding_box() # moved here *** + self.height = bounds[1] # moved here *** y_offset = int( ( - self.font.get_glyph(ord("M")).height + self._font.get_glyph(ord("M")).height - new_text.count("\n") * self.height * self.line_spacing ) / 2 @@ -121,7 +117,7 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals y += int(self.height * self._line_spacing) x = 0 continue - glyph = self.font.get_glyph(ord(character)) + glyph = self._font.get_glyph(ord(character)) if not glyph: continue right = max(right, x + glyph.width) @@ -176,7 +172,7 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals and old_c < len(self._text) and ( self._text[old_c] == "\n" - or not self.font.get_glyph(ord(self._text[old_c])) + or not self._font.get_glyph(ord(self._text[old_c])) ) ): old_c += 1 @@ -238,6 +234,17 @@ def text(self): def text(self, new_text): self._update_text(str(new_text)) + @property + def font(self): + return self._font + + @font.setter + def font(self, newFont): + old_text=self._text + self._text='' + self._font=newFont + self._update_text(str(old_text)) + @property def anchor_point(self): """Point that anchored_position moves relative to. From 756088bbfc940def2a372918a89e10d20de8a72f Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 07:46:31 -0500 Subject: [PATCH 02/22] deleted print statements --- adafruit_display_text/label.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 4d82588..9d39765 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -32,7 +32,6 @@ https://github.com/adafruit/circuitpython/releases """ -print('loading label.py Yay!') import displayio @@ -110,7 +109,6 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals ) / 2 ) - # print("y offset from baseline", y_offset) left = right = top = bottom = 0 for character in new_text: if character == "\n": @@ -163,7 +161,7 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals x += glyph.shift_x - # TODO skip this for control sequences or non-printables. + # TODO skip this for control sequences or non-qables. i += 1 old_c += 1 # skip all non-prinables in the old string From bb79810529894d66778f880901b6060e8c759dbf Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:26:53 -0500 Subject: [PATCH 03/22] Updated font.height and ran black formatter --- adafruit_display_text/label.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 9d39765..a564805 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -100,8 +100,6 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals y = 0 i = 0 old_c = 0 - bounds = self._font.get_bounding_box() # moved here *** - self.height = bounds[1] # moved here *** y_offset = int( ( self._font.get_glyph(ord("M")).height @@ -238,9 +236,11 @@ def font(self): @font.setter def font(self, newFont): - old_text=self._text - self._text='' - self._font=newFont + old_text = self._text + self._text = "" + self._font = newFont + bounds = self._font.get_bounding_box() + self.height = bounds[1] self._update_text(str(old_text)) @property From 37febaef3cabfbddfa3f01a064485fde25c87e2e Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:30:51 -0500 Subject: [PATCH 04/22] updated newFont to new_font for plint --- adafruit_display_text/label.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index a564805..2b0229a 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -235,14 +235,15 @@ def font(self): return self._font @font.setter - def font(self, newFont): - old_text = self._text - self._text = "" - self._font = newFont + def font(self, new_font): + old_text=self._text + self._text='' + self._font=new_font bounds = self._font.get_bounding_box() - self.height = bounds[1] + self.height = bounds[1] self._update_text(str(old_text)) + @property def anchor_point(self): """Point that anchored_position moves relative to. From b0ca00ef2fa85b3b04cc44769cf72665fbe60efe Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:33:02 -0500 Subject: [PATCH 05/22] re-ran black for formatting --- adafruit_display_text/label.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 2b0229a..643e35b 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -236,14 +236,13 @@ def font(self): @font.setter def font(self, new_font): - old_text=self._text - self._text='' - self._font=new_font + old_text = self._text + self._text = "" + self._font = new_font bounds = self._font.get_bounding_box() - self.height = bounds[1] + self.height = bounds[1] self._update_text(str(old_text)) - @property def anchor_point(self): """Point that anchored_position moves relative to. From b5593bc5e5b3c639a0ab60944289227604a5dcad Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:38:39 -0500 Subject: [PATCH 06/22] added comment for font setter to satisfy pylint --- adafruit_display_text/label.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 643e35b..bf0c9a1 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -232,6 +232,7 @@ def text(self, new_text): @property def font(self): + """Font to use for text.""" return self._font @font.setter From a2473b518ef4b87fa94705d98b6d49c8b464634f Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:44:09 -0500 Subject: [PATCH 07/22] deleted one blank line --- adafruit_display_text/label.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index bf0c9a1..3dbcf84 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -32,7 +32,6 @@ https://github.com/adafruit/circuitpython/releases """ - import displayio __version__ = "0.0.0-auto.0" From 52a3becd774a3fe952fc4541a78495b1335699df Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 08:56:06 -0500 Subject: [PATCH 08/22] deleted blank space, blank line, added some spaces after =, updated comment --- adafruit_display_text/label.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 3dbcf84..1c82b48 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -231,7 +231,7 @@ def text(self, new_text): @property def font(self): - """Font to use for text.""" + """Font to use for text display.""" return self._font @font.setter From 96f2f11555b97df05c10672d27b41ef73f5867b2 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 09:01:40 -0500 Subject: [PATCH 09/22] modified comment description to try to overcome Sphinx Unexpected Indent error --- adafruit_display_text/label.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 1c82b48..a2047e4 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -231,7 +231,9 @@ def text(self, new_text): @property def font(self): - """Font to use for text display.""" + """ + Font to use for text display. + """ return self._font @font.setter From a1c4859ca71b80a1d97f429b0e02a710c3a2d913 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 09:04:48 -0500 Subject: [PATCH 10/22] reverted back to previous revision without extra lines. Still no luck with Sphinx error... --- adafruit_display_text/label.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index a2047e4..1c82b48 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -231,9 +231,7 @@ def text(self, new_text): @property def font(self): - """ - Font to use for text display. - """ + """Font to use for text display.""" return self._font @font.setter From e60fb65c70a13a9271e35c696e1cfe035021afc6 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 22:13:43 -0500 Subject: [PATCH 11/22] Corrected calculation errors in anchored_position getter and setter --- adafruit_display_text/label.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 1c82b48..70b1814 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -259,11 +259,11 @@ def anchored_position(self): """Position relative to the anchor_point. Tuple containing x,y pixel coordinates.""" return ( - self.x - self._boundingbox[2] * self._anchor_point[0], - self.y - self._boundingbox[3] * self._anchor_point[1], + int(self.x + self._boundingbox[0] + self._anchor_point[0] * self._boundingbox[2]), + int(self.y + self._boundingbox[1] + self._anchor_point[1] * self._boundingbox[3]), ) @anchored_position.setter def anchored_position(self, new_position): - self.x = int(new_position[0] - (self._boundingbox[2] * self._anchor_point[0])) - self.y = int(new_position[1] - (self._boundingbox[3] * self._anchor_point[1])) + self.x = int(new_position[0] - self._boundingbox[0] - self._anchor_point[0] * self._boundingbox[2]) + self.y = int(new_position[1] - self._boundingbox[1] - self._anchor_point[1] * self._boundingbox[3]) From 995f3decbaf27ad083d11eb4983e8adf544d0100 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 22:29:58 -0500 Subject: [PATCH 12/22] ran black --- adafruit_display_text/label.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 70b1814..428379c 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -259,11 +259,27 @@ def anchored_position(self): """Position relative to the anchor_point. Tuple containing x,y pixel coordinates.""" return ( - int(self.x + self._boundingbox[0] + self._anchor_point[0] * self._boundingbox[2]), - int(self.y + self._boundingbox[1] + self._anchor_point[1] * self._boundingbox[3]), + int( + self.x + + self._boundingbox[0] + + self._anchor_point[0] * self._boundingbox[2] + ), + int( + self.y + + self._boundingbox[1] + + self._anchor_point[1] * self._boundingbox[3] + ), ) @anchored_position.setter def anchored_position(self, new_position): - self.x = int(new_position[0] - self._boundingbox[0] - self._anchor_point[0] * self._boundingbox[2]) - self.y = int(new_position[1] - self._boundingbox[1] - self._anchor_point[1] * self._boundingbox[3]) + self.x = int( + new_position[0] + - self._boundingbox[0] + - self._anchor_point[0] * self._boundingbox[2] + ) + self.y = int( + new_position[1] + - self._boundingbox[1] + - self._anchor_point[1] * self._boundingbox[3] + ) From 12d8b25f949f54d0acd9b5f0333d1ea4ae932bb5 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 22:43:01 -0500 Subject: [PATCH 13/22] updated setter for anchor_point so that x,y are updated upon change to anchor_point --- adafruit_display_text/label.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 428379c..47b70ef 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -252,7 +252,9 @@ def anchor_point(self): @anchor_point.setter def anchor_point(self, new_anchor_point): + current_anchored_position = self.anchored_position self._anchor_point = new_anchor_point + self.anchored_position = current_anchored_position @property def anchored_position(self): From 02f26d93e038086c21c79832b4726b0723bb96ad Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 22:56:30 -0500 Subject: [PATCH 14/22] updated anchor_positions example so that anchor positions correspond to the edges and corners of the display --- examples/display_text_anchored_position.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/display_text_anchored_position.py b/examples/display_text_anchored_position.py index b0728fe..5592c0d 100644 --- a/examples/display_text_anchored_position.py +++ b/examples/display_text_anchored_position.py @@ -12,19 +12,19 @@ text_area_top_left = label.Label(terminalio.FONT, text=TEXT) text_area_top_left.anchor_point = (0.0, 0.0) -text_area_top_left.anchored_position = (10, 10) +text_area_top_left.anchored_position = (0, 0) text_area_top_middle = label.Label(terminalio.FONT, text=TEXT) text_area_top_middle.anchor_point = (0.5, 0.0) -text_area_top_middle.anchored_position = (DISPLAY_WIDTH / 2, 10) +text_area_top_middle.anchored_position = (DISPLAY_WIDTH / 2, 0) text_area_top_right = label.Label(terminalio.FONT, text=TEXT) text_area_top_right.anchor_point = (1.0, 0.0) -text_area_top_right.anchored_position = (DISPLAY_WIDTH - 10, 10) +text_area_top_right.anchored_position = (DISPLAY_WIDTH, 0) text_area_middle_left = label.Label(terminalio.FONT, text=TEXT) text_area_middle_left.anchor_point = (0.0, 0.5) -text_area_middle_left.anchored_position = (10, DISPLAY_HEIGHT / 2) +text_area_middle_left.anchored_position = (0, DISPLAY_HEIGHT / 2) text_area_middle_middle = label.Label(terminalio.FONT, text=TEXT) text_area_middle_middle.anchor_point = (0.5, 0.5) @@ -32,11 +32,11 @@ text_area_middle_right = label.Label(terminalio.FONT, text=TEXT) text_area_middle_right.anchor_point = (1.0, 0.5) -text_area_middle_right.anchored_position = (DISPLAY_WIDTH - 10, DISPLAY_HEIGHT / 2) +text_area_middle_right.anchored_position = (DISPLAY_WIDTH, DISPLAY_HEIGHT / 2) text_area_bottom_left = label.Label(terminalio.FONT, text=TEXT) text_area_bottom_left.anchor_point = (0.0, 1.0) -text_area_bottom_left.anchored_position = (10, DISPLAY_HEIGHT) +text_area_bottom_left.anchored_position = (0, DISPLAY_HEIGHT) text_area_bottom_middle = label.Label(terminalio.FONT, text=TEXT) text_area_bottom_middle.anchor_point = (0.5, 1.0) @@ -44,7 +44,7 @@ text_area_bottom_right = label.Label(terminalio.FONT, text=TEXT) text_area_bottom_right.anchor_point = (1.0, 1.0) -text_area_bottom_right.anchored_position = (DISPLAY_WIDTH - 10, DISPLAY_HEIGHT) +text_area_bottom_right.anchored_position = (DISPLAY_WIDTH, DISPLAY_HEIGHT) text_group = displayio.Group(max_size=9) text_group.append(text_area_top_middle) From 69cc1bf893fd82538f1275190d635ffbca1cc7a4 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Fri, 22 May 2020 23:33:21 -0500 Subject: [PATCH 15/22] updated font and text setters, so that the anchored_position is properly set after a font or text change --- adafruit_display_text/label.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 47b70ef..ef74e02 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -227,7 +227,9 @@ def text(self): @text.setter def text(self, new_text): + current_anchored_position = self.anchored_position self._update_text(str(new_text)) + self.anchored_position = current_anchored_position @property def font(self): @@ -237,11 +239,13 @@ def font(self): @font.setter def font(self, new_font): old_text = self._text + current_anchored_position = self.anchored_position self._text = "" self._font = new_font bounds = self._font.get_bounding_box() self.height = bounds[1] self._update_text(str(old_text)) + self.anchored_position = current_anchored_position @property def anchor_point(self): From 0defe7dea3a1fda8f4b4e433013f5caec5af8c32 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 09:48:58 -0500 Subject: [PATCH 16/22] trial to overcome too many instance variables issue from pylint --- adafruit_display_text/label.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index ef74e02..9199664 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -50,6 +50,9 @@ class Label(displayio.Group): :param int color: Color of all text in RGB hex :param double line_spacing: Line spacing of text to display""" + # pylint: disable=too-many-instance-attributes + # This has several getters and setters, maybe needs to be cleaned up. + def __init__( self, font, From ed64879d2da49355d803f657d518087076256bcc Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 09:52:54 -0500 Subject: [PATCH 17/22] added a line in the comments to try to resolve unexpected indent response from Sphinx --- adafruit_display_text/label.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 9199664..adf40e2 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -43,6 +43,7 @@ class Label(displayio.Group): properties will be the left edge of the bounding box, and in the center of a M glyph (if its one line), or the (number of lines * linespacing + M)/2. That is, it will try to have it be center-left as close as possible. + :param Font font: A font class that has ``get_bounding_box`` and ``get_glyph``. Must include a capital M for measuring character size. :param str text: Text to display From 173d0c5b675f5166492db749004752288ebb528f Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 11:32:37 -0500 Subject: [PATCH 18/22] updated spacing in header and deleted one tab, thanks foamyguy --- adafruit_display_text/label.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index adf40e2..e3bf326 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -22,14 +22,20 @@ """ `adafruit_display_text.label` ==================================================== + Displays text labels using CircuitPython's displayio. + * Author(s): Scott Shawcroft + Implementation Notes -------------------- + **Hardware:** **Software and Dependencies:** + * Adafruit CircuitPython firmware for the supported boards: https://github.com/adafruit/circuitpython/releases + """ import displayio @@ -43,7 +49,7 @@ class Label(displayio.Group): properties will be the left edge of the bounding box, and in the center of a M glyph (if its one line), or the (number of lines * linespacing + M)/2. That is, it will try to have it be center-left as close as possible. - + :param Font font: A font class that has ``get_bounding_box`` and ``get_glyph``. Must include a capital M for measuring character size. :param str text: Text to display @@ -51,9 +57,6 @@ class Label(displayio.Group): :param int color: Color of all text in RGB hex :param double line_spacing: Line spacing of text to display""" - # pylint: disable=too-many-instance-attributes - # This has several getters and setters, maybe needs to be cleaned up. - def __init__( self, font, From ac63a182ec094f7de94d51e9a47b4cee8eacaa25 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 11:33:39 -0500 Subject: [PATCH 19/22] Added one more missing line, thanks foamyguy --- adafruit_display_text/label.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index e3bf326..16888ed 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -31,6 +31,7 @@ -------------------- **Hardware:** + **Software and Dependencies:** * Adafruit CircuitPython firmware for the supported boards: From 68c9522a34bfbcf880e2542f54bbc3109b5f3b5c Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 11:42:07 -0500 Subject: [PATCH 20/22] added pylint disable=too-many-instance-attributes to resolve getter-setter definitions --- adafruit_display_text/label.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 16888ed..6e4f412 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -58,6 +58,10 @@ class Label(displayio.Group): :param int color: Color of all text in RGB hex :param double line_spacing: Line spacing of text to display""" + # pylint: disable=too-many-instance-attributes + # This has a lot of getters/setters, maybe it needs cleanup. + + def __init__( self, font, From a102ba21258706e6891098502096ee9206c76b9b Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 11:45:19 -0500 Subject: [PATCH 21/22] ran black --- adafruit_display_text/label.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 6e4f412..6fa3f02 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -61,7 +61,6 @@ class Label(displayio.Group): # pylint: disable=too-many-instance-attributes # This has a lot of getters/setters, maybe it needs cleanup. - def __init__( self, font, From 6695e3c7c4fcd95dc3e0b46d154223e44cd40159 Mon Sep 17 00:00:00 2001 From: Margaret Matocha Date: Sat, 23 May 2020 16:10:32 -0500 Subject: [PATCH 22/22] fixed an error I made to a comment --- adafruit_display_text/label.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index 6fa3f02..64730b6 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -169,10 +169,10 @@ def _update_text(self, new_text): # pylint: disable=too-many-locals x += glyph.shift_x - # TODO skip this for control sequences or non-qables. + # TODO skip this for control sequences or non-printables. i += 1 old_c += 1 - # skip all non-prinables in the old string + # skip all non-printables in the old string while ( self._text and old_c < len(self._text)