fix with attribute override. code format

FoamyGuy · FoamyGuy · commit 734b0be52245 · 2022-02-27T15:48:23.000-06:00
diff --git a/displayio_gauge.py b/displayio_gauge.py
@@ -69,9 +69,9 @@ def __init__(
         self.xcenter = x
         self.ycenter = y
         self.radius = radius
-        self.width = thickness
+        self._width = thickness
         if thickness < 2:
-            self.width = 2
+            self._width = 2
         self._level = level
         tileGridWidth = 2 * self.radius + 1
         tileGridHeight = math.ceil(0.71 * self.radius) + self.radius + 1
@@ -118,7 +118,7 @@ def _draw_gauge(self):
 
         # Inner Arc
         x = 0
-        y = self.radius - self.width + 1
+        y = self.radius - self._width + 1
         d = 3 - 2 * y
 
         while x <= y:
@@ -176,10 +176,10 @@ def _draw_level(self):
             round(math.cos(math.radians(prog)) * (self.radius - 1), 0)
         )
         xe = self.radius + int(
-            round(math.sin(math.radians(prog)) * (self.radius - self.width + 2), 0)
+            round(math.sin(math.radians(prog)) * (self.radius - self._width + 2), 0)
         )
         ye = self.radius + int(
-            round(math.cos(math.radians(prog)) * (self.radius - self.width + 2), 0)
+            round(math.cos(math.radians(prog)) * (self.radius - self._width + 2), 0)
         )
 
         # Draw end line for level value
@@ -189,13 +189,13 @@ def _draw_level(self):
 
         xp = self.radius + int(
             round(
-                math.sin(math.radians(prog + 1)) * (self.radius - int(self.width / 2)),
+                math.sin(math.radians(prog + 1)) * (self.radius - int(self._width / 2)),
                 0,
             )
         )
         yp = self.radius + int(
             round(
-                math.cos(math.radians(prog + 1)) * (self.radius - int(self.width / 2)),
+                math.cos(math.radians(prog + 1)) * (self.radius - int(self._width / 2)),
                 0,
             )
         )
@@ -205,14 +205,14 @@ def _draw_level(self):
             xp = self.radius + int(
                 round(
                     math.sin(math.radians(prog + i))
-                    * (self.radius - int(self.width / 2)),
+                    * (self.radius - int(self._width / 2)),
                     0,
                 )
             )
             yp = self.radius + int(
                 round(
                     math.cos(math.radians(prog + i))
-                    * (self.radius - int(self.width / 2)),
+                    * (self.radius - int(self._width / 2)),
                     0,
                 )
             )
@@ -234,10 +234,10 @@ def _draw_regress(self):
             round(math.cos(math.radians(prog)) * (self.radius - 1), 0)
         )
         xe = self.radius + int(
-            round(math.sin(math.radians(prog)) * (self.radius - self.width + 2), 0)
+            round(math.sin(math.radians(prog)) * (self.radius - self._width + 2), 0)
         )
         ye = self.radius + int(
-            round(math.cos(math.radians(prog)) * (self.radius - self.width + 2), 0)
+            round(math.cos(math.radians(prog)) * (self.radius - self._width + 2), 0)
         )
 
         # Draw end line for level value
@@ -250,13 +250,13 @@ def _draw_regress(self):
 
         xp = self.radius + int(
             round(
-                math.sin(math.radians(prog - 1)) * (self.radius - int(self.width / 2)),
+                math.sin(math.radians(prog - 1)) * (self.radius - int(self._width / 2)),
                 0,
             )
         )
         yp = self.radius + int(
             round(
-                math.cos(math.radians(prog - 1)) * (self.radius - int(self.width / 2)),
+                math.cos(math.radians(prog - 1)) * (self.radius - int(self._width / 2)),
                 0,
             )
         )
@@ -266,14 +266,14 @@ def _draw_regress(self):
             xp = self.radius + int(
                 round(
                     math.sin(math.radians(prog - i))
-                    * (self.radius - int(self.width / 2)),
+                    * (self.radius - int(self._width / 2)),
                     0,
                 )
             )
             yp = self.radius + int(
                 round(
                     math.cos(math.radians(prog - i))
-                    * (self.radius - int(self.width / 2)),
+                    * (self.radius - int(self._width / 2)),
                     0,
                 )
             )
diff --git a/examples/displayio_gauge_multiple_test.py b/examples/displayio_gauge_multiple_test.py
@@ -97,7 +97,7 @@
             gauge4.foreground_color = 0x00FF00
             gauge5.foreground_color = 0x00FF00
 
-        gauge4.level= i
+        gauge4.level = i
         gauge5.level = i
         time.sleep(0.1)
 
@@ -109,6 +109,6 @@
             gauge4.foreground_color = 0x00FF00
             gauge5.foreground_color = 0x00FF00
 
-        gauge4.level= i
+        gauge4.level = i
         gauge5.level = i
         time.sleep(0.1)
diff --git a/examples/displayio_gauge_simpletest.py b/examples/displayio_gauge_simpletest.py
@@ -32,7 +32,7 @@
     radius=30,
     foreground_color=0x00FF00,
     background_color=0x000000,
-    outline_color=0xFFFFFF
+    outline_color=0xFFFFFF,
 )
 main_group.append(example_gauge)
 
diff --git a/examples/test_for_leaks.py b/examples/test_for_leaks.py
@@ -16,21 +16,28 @@
 color_pass = 0x009900
 color_fail = 0x990000
 
+
 def make_gauge(radius, thickness):
-    return Gauge(x=display.width//2,y=display.height//2,
-        radius=radius, thickness=thickness, level=10,
+    return Gauge(
+        x=display.width // 2,
+        y=display.height // 2,
+        radius=radius,
+        thickness=thickness,
+        level=10,
         outline_color=0xEEEEEE,
         foreground_color=0xFFCC00,
-        background_color=0x3333FF)
+        background_color=0x3333FF,
+    )
+
 
 # pylint: disable=W0212
 # test access to gauge._bitmap
 def check(gauge):
     bitmap = gauge._bitmap
-    top_left = (1,1)
-    top_right = (bitmap.width-1,1)
-    bottom_center = (bitmap.width//2, bitmap.height-1)
-    if bitmap[top_left[0],top_left[1]] != 0:
+    top_left = (1, 1)
+    top_right = (bitmap.width - 1, 1)
+    bottom_center = (bitmap.width // 2, bitmap.height - 1)
+    if bitmap[top_left[0], top_left[1]] != 0:
         raise ValueError("leak detected top_left")
     if bitmap[top_right[0], top_right[1]] != 0:
         raise ValueError("leak detected top_right")
@@ -39,27 +46,27 @@ def check(gauge):
 
 
 def find_leaks(gauge):
-    for x in range(360*3.0):
+    for x in range(360 * 3.0):
         theta = math.radians(x)
         level = int(abs(math.sin(theta) * 100))
         gauge.level = level
         check(gauge)
 
 
-
 for iteration in range(5):
-    my_radius = random.randrange(10,90)
-    my_thickness = int(min(
-        max(my_radius*0.2, my_radius*random.random()),my_radius*0.85))
+    my_radius = random.randrange(10, 90)
+    my_thickness = int(
+        min(max(my_radius * 0.2, my_radius * random.random()), my_radius * 0.85)
+    )
     print(f"iteration={iteration} radius={my_radius} thickness={my_thickness}")
     my_gauge = make_gauge(my_radius, my_thickness)
     top_group[0] = my_gauge
     try:
         find_leaks(my_gauge)
-        my_gauge.background_color=color_pass
+        my_gauge.background_color = color_pass
         time.sleep(3)
     except ValueError:
-        my_gauge.background_color=color_fail
+        my_gauge.background_color = color_fail
         break
 
 if my_gauge.background_color == color_pass:

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ def __init__(`
`69`	`69`	`self.xcenter = x`
`70`	`70`	`self.ycenter = y`
`71`	`71`	`self.radius = radius`
`72`		`- self.width = thickness`
	`72`	`+ self._width = thickness`
`73`	`73`	`if thickness < 2:`
`74`		`- self.width = 2`
	`74`	`+ self._width = 2`
`75`	`75`	`self._level = level`
`76`	`76`	`tileGridWidth = 2 * self.radius + 1`
`77`	`77`	`tileGridHeight = math.ceil(0.71 * self.radius) + self.radius + 1`
`@@ -118,7 +118,7 @@ def _draw_gauge(self):`
`118`	`118`
`119`	`119`	`# Inner Arc`
`120`	`120`	`x = 0`
`121`		`- y = self.radius - self.width + 1`
	`121`	`+ y = self.radius - self._width + 1`
`122`	`122`	`d = 3 - 2 * y`
`123`	`123`
`124`	`124`	`while x <= y:`
`@@ -176,10 +176,10 @@ def _draw_level(self):`
`176`	`176`	`round(math.cos(math.radians(prog)) * (self.radius - 1), 0)`
`177`	`177`	`)`
`178`	`178`	`xe = self.radius + int(`
`179`		`- round(math.sin(math.radians(prog)) * (self.radius - self.width + 2), 0)`
	`179`	`+ round(math.sin(math.radians(prog)) * (self.radius - self._width + 2), 0)`
`180`	`180`	`)`
`181`	`181`	`ye = self.radius + int(`
`182`		`- round(math.cos(math.radians(prog)) * (self.radius - self.width + 2), 0)`
	`182`	`+ round(math.cos(math.radians(prog)) * (self.radius - self._width + 2), 0)`
`183`	`183`	`)`
`184`	`184`
`185`	`185`	`# Draw end line for level value`
`@@ -189,13 +189,13 @@ def _draw_level(self):`
`189`	`189`
`190`	`190`	`xp = self.radius + int(`
`191`	`191`	`round(`
`192`		`- math.sin(math.radians(prog + 1)) * (self.radius - int(self.width / 2)),`
	`192`	`+ math.sin(math.radians(prog + 1)) * (self.radius - int(self._width / 2)),`
`193`	`193`	`0,`
`194`	`194`	`)`
`195`	`195`	`)`
`196`	`196`	`yp = self.radius + int(`
`197`	`197`	`round(`
`198`		`- math.cos(math.radians(prog + 1)) * (self.radius - int(self.width / 2)),`
	`198`	`+ math.cos(math.radians(prog + 1)) * (self.radius - int(self._width / 2)),`
`199`	`199`	`0,`
`200`	`200`	`)`
`201`	`201`	`)`
`@@ -205,14 +205,14 @@ def _draw_level(self):`
`205`	`205`	`xp = self.radius + int(`
`206`	`206`	`round(`
`207`	`207`	`math.sin(math.radians(prog + i))`
`208`		`- * (self.radius - int(self.width / 2)),`
	`208`	`+ * (self.radius - int(self._width / 2)),`
`209`	`209`	`0,`
`210`	`210`	`)`
`211`	`211`	`)`
`212`	`212`	`yp = self.radius + int(`
`213`	`213`	`round(`
`214`	`214`	`math.cos(math.radians(prog + i))`
`215`		`- * (self.radius - int(self.width / 2)),`
	`215`	`+ * (self.radius - int(self._width / 2)),`
`216`	`216`	`0,`
`217`	`217`	`)`
`218`	`218`	`)`
`@@ -234,10 +234,10 @@ def _draw_regress(self):`
`234`	`234`	`round(math.cos(math.radians(prog)) * (self.radius - 1), 0)`
`235`	`235`	`)`
`236`	`236`	`xe = self.radius + int(`
`237`		`- round(math.sin(math.radians(prog)) * (self.radius - self.width + 2), 0)`
	`237`	`+ round(math.sin(math.radians(prog)) * (self.radius - self._width + 2), 0)`
`238`	`238`	`)`
`239`	`239`	`ye = self.radius + int(`
`240`		`- round(math.cos(math.radians(prog)) * (self.radius - self.width + 2), 0)`
	`240`	`+ round(math.cos(math.radians(prog)) * (self.radius - self._width + 2), 0)`
`241`	`241`	`)`
`242`	`242`
`243`	`243`	`# Draw end line for level value`
`@@ -250,13 +250,13 @@ def _draw_regress(self):`
`250`	`250`
`251`	`251`	`xp = self.radius + int(`
`252`	`252`	`round(`
`253`		`- math.sin(math.radians(prog - 1)) * (self.radius - int(self.width / 2)),`
	`253`	`+ math.sin(math.radians(prog - 1)) * (self.radius - int(self._width / 2)),`
`254`	`254`	`0,`
`255`	`255`	`)`
`256`	`256`	`)`
`257`	`257`	`yp = self.radius + int(`
`258`	`258`	`round(`
`259`		`- math.cos(math.radians(prog - 1)) * (self.radius - int(self.width / 2)),`
	`259`	`+ math.cos(math.radians(prog - 1)) * (self.radius - int(self._width / 2)),`
`260`	`260`	`0,`
`261`	`261`	`)`
`262`	`262`	`)`
`@@ -266,14 +266,14 @@ def _draw_regress(self):`
`266`	`266`	`xp = self.radius + int(`
`267`	`267`	`round(`
`268`	`268`	`math.sin(math.radians(prog - i))`
`269`		`- * (self.radius - int(self.width / 2)),`
	`269`	`+ * (self.radius - int(self._width / 2)),`
`270`	`270`	`0,`
`271`	`271`	`)`
`272`	`272`	`)`
`273`	`273`	`yp = self.radius + int(`
`274`	`274`	`round(`
`275`	`275`	`math.cos(math.radians(prog - i))`
`276`		`- * (self.radius - int(self.width / 2)),`
	`276`	`+ * (self.radius - int(self._width / 2)),`
`277`	`277`	`0,`
`278`	`278`	`)`
`279`	`279`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`radius=30,`
`33`	`33`	`foreground_color=0x00FF00,`
`34`	`34`	`background_color=0x000000,`
`35`		`- outline_color=0xFFFFFF`
	`35`	`+ outline_color=0xFFFFFF,`
`36`	`36`	`)`
`37`	`37`	`main_group.append(example_gauge)`
`38`	`38`