Skip to content

Commit

Permalink
remove dups
Browse files Browse the repository at this point in the history
  • Loading branch information
@time4tea
time4tea committed Feb 10, 2024
1 parent 356e98b commit f1c871b
Showing 1 changed file with 54 additions and 116 deletions.
170 changes: 54 additions & 116 deletions gopro_overlay/widgets/msi.py
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,7 @@
import math

from PIL import Image, ImageDraw

from gopro_overlay.widgets.widgets import Widget


def roundup(x, n=10):
return int(math.ceil(x / n)) * n


class Arc:
def __init__(self, size):
self.centre = size / 2
self.correction = 90

def bbox(self, r_delta):
return (
(self.centre - (self.centre - r_delta), self.centre - (self.centre - r_delta)),
(self.centre + (self.centre - r_delta), self.centre + (self.centre - r_delta))
)

def arc(self, draw, r_delta, start=0, end=360, **kwargs):
draw.arc(
self.bbox(r_delta),
start=start - self.correction,
end=end - self.correction,
**kwargs
)

def pieslice(self, draw, r_delta, start=0, end=360, **kwargs):
draw.pieslice(
self.bbox(r_delta),
start=start - self.correction,
end=end - self.correction,
**kwargs
)

def locate(self, angle, r_delta):
return (
self.centre + ((self.centre - r_delta) * math.sin(math.radians(angle))),
self.centre - ((self.centre - r_delta) * math.cos(math.radians(angle)))
)

def line(self, draw, places, **kwargs):
draw.line(
[self.locate(a, d) for a, d in places],
**kwargs
)


def scale(min_value, max_value, rotate=180):
start_angle = 30
end_angle = 360 - start_angle

a_range = end_angle - start_angle

def s(v):
v_point = (v - min_value) / (max_value - min_value)

a_point = a_range * v_point

return a_point + start_angle + rotate

return s
from .asi import roundup, scale, Arc
from .widgets import Widget


class MotorspeedIndicator(Widget):
Expand All @@ -75,11 +14,10 @@ def __init__(self, size, font, needle, reading, green, yellow, end, rotate=180,
self.needle = needle
self.reading = reading
self.outline = outline


self.width = int(size/17) #15

self.step = 5
self.width = int(size / 17) # 15

self.step = 5

self.asi_max = roundup(end * 0.05 + end, self.step * 4)

Expand All @@ -94,9 +32,9 @@ def __init__(self, size, font, needle, reading, green, yellow, end, rotate=180,

def ticklenwidth(self, value):
if value % 10 == 0:
return int(self.width)+int(self.size/51), int(self.size/128)
return int(self.width)-int(self.size/51), int(self.size/256)
return int(self.width) + int(self.size / 51), int(self.size / 128)
return int(self.width) - int(self.size / 51), int(self.size / 256)

def draw_msi(self):

image = Image.new(mode="RGBA", size=(self.size, self.size))
Expand All @@ -106,12 +44,12 @@ def draw_msi(self):

arc = Arc(self.size)

arc.pieslice(draw, 0, outline=(0, 0, 0, 128), fill=(0, 0, 0, 128), width=int(self.size/128))
if self.needle == 1: # Needle
arc.pieslice(draw, 0, outline=(0, 0, 0, 128), fill=(0, 0, 0, 128), width=int(self.size / 128))

if self.needle == 1: # Needle
arc.arc(draw, 0, start=self.xa(self.green), end=self.xa(self.yellow), fill=(51, 193, 25), width=widths)
arc.arc(draw, 0, start=self.xa(self.yellow), end=self.xa(self.end), fill=(237, 239, 42), width=widths)

for value in range(0, self.asi_max + self.step, self.step):
ticklen, width = self.ticklenwidth(value)
arc.line(draw, [(self.xa(value), ticklen), (self.xa(value), 0)], fill=self.fg, width=width)
Expand All @@ -130,52 +68,51 @@ def draw_msi(self):
return image

def draw(self, image: Image, draw: ImageDraw):

if self.image is None:
self.image = self.draw_msi()

image.alpha_composite(self.image, (0, 0))

reading = self.reading()
color = (0, 191, 255)
color = (0, 191, 255)

if reading < 0:
reading = 0
# Possible change color according ranges
#elif reading < 50:
# elif reading < 50:
# color = (51, 193, 25)
#elif reading < 180:
# elif reading < 180:
# color = (237, 239, 42)


arc = Arc(self.size)

if self.needle == 1: # Needle
if self.needle == 1: # Needle
draw.polygon(
[
arc.locate(self.xa(reading) - 0, 0),
arc.locate(self.xa(reading) - 90, (self.size / 2) - (self.size / 32)),
arc.locate(self.xa(reading) - 180, (self.size / 2) - (self.size / 32)),
arc.locate(self.xa(reading) + 90, (self.size / 2) - (self.size / 32)),
],
[
arc.locate(self.xa(reading) - 0, 0),
arc.locate(self.xa(reading) - 90, (self.size / 2) - (self.size / 32)),
arc.locate(self.xa(reading) - 180, (self.size / 2) - (self.size / 32)),
arc.locate(self.xa(reading) + 90, (self.size / 2) - (self.size / 32)),
],
fill=self.fg
)
else: # Arc
arc.arc(draw, 0, start=self.xa(0), end=self.xa(reading), fill=color, width=self.width)

# Marker
#radius = int(self.size/9) #27
#x0 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) - self.width/2
#y0 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) - self.width/2
#x1 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) + self.width/2
#y1 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) + self.width/2
#draw.ellipse([(x0,y0),(x1,y1)],fill ="#ADD8E6", outline ="#ADD8E6")
# radius = int(self.size/9) #27
# x0 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) - self.width/2
# y0 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) - self.width/2
# x1 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) + self.width/2
# y1 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) + self.width/2
# draw.ellipse([(x0,y0),(x1,y1)],fill ="#ADD8E6", outline ="#ADD8E6")

for value in range(0, self.asi_max + self.step, self.step):
ticklen, width = self.ticklenwidth(value)
arc.line(draw, [(self.xa(value), ticklen), (self.xa(value), 0)], fill=self.fg, width=width)


class MotorspeedIndicator2(Widget):

def __init__(self, size, font, reading, green, yellow, end, rotate=180, outline=2):
Expand All @@ -185,12 +122,11 @@ def __init__(self, size, font, reading, green, yellow, end, rotate=180, outline=
self.font = font
self.reading = reading
self.outline = outline


self.width = int(size/17) #15
self.offset = int(size/51) # 5

self.step = 5
self.width = int(size / 17) # 15
self.offset = int(size / 51) # 5

self.step = 5

self.asi_max = roundup(end * 0.05 + end, self.step * 4)

Expand All @@ -205,9 +141,9 @@ def __init__(self, size, font, reading, green, yellow, end, rotate=180, outline=

def ticklenwidth(self, value):
if value % 10 == 0:
return int(self.width*2)+self.offset-2, int(self.size/128)
return int(self.width)+self.offset, int(self.size/256)
return int(self.width * 2) + self.offset - 2, int(self.size / 128)
return int(self.width) + self.offset, int(self.size / 256)

def draw_msi(self):

image = Image.new(mode="RGBA", size=(self.size, self.size))
Expand All @@ -217,8 +153,9 @@ def draw_msi(self):

arc = Arc(self.size)

arc.pieslice(draw, 0, outline=(0, 0, 0, 128), fill=(0, 0, 0, 128), width=int(self.size/128))
arc.arc(draw, self.offset, start=self.xa(self.green), end=self.xa(self.yellow), fill=(51, 193, 25), width=widths)
arc.pieslice(draw, 0, outline=(0, 0, 0, 128), fill=(0, 0, 0, 128), width=int(self.size / 128))
arc.arc(draw, self.offset, start=self.xa(self.green), end=self.xa(self.yellow), fill=(51, 193, 25),
width=widths)
arc.arc(draw, self.offset, start=self.xa(self.yellow), end=self.xa(self.end), fill=(237, 239, 42), width=widths)

for value in range(0, self.asi_max + (self.step * 4), self.step * 4):
Expand All @@ -235,7 +172,7 @@ def draw_msi(self):
return image

def draw(self, image: Image, draw: ImageDraw):

if self.image is None:
self.image = self.draw_msi()

Expand All @@ -247,16 +184,17 @@ def draw(self, image: Image, draw: ImageDraw):
reading = 0

arc = Arc(self.size)
arc.arc(draw, self.offset + self.width, start=self.xa(0), end=self.xa(reading), fill=(0, 191, 255), width=self.width)

arc.arc(draw, self.offset + self.width, start=self.xa(0), end=self.xa(reading), fill=(0, 191, 255),
width=self.width)

# Marker
#radius = int(self.size/9) #27
#x0 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) - self.width/2
#y0 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) - self.width/2
#x1 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) + self.width/2
#y1 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) + self.width/2
#draw.ellipse([(x0,y0),(x1,y1)],fill ="#ADD8E6", outline ="#ADD8E6")
# radius = int(self.size/9) #27
# x0 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) - self.width/2
# y0 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) - self.width/2
# x1 = arc.centre + ((arc.centre - radius) * math.sin(math.radians(self.xa(reading)))) + self.width/2
# y1 = arc.centre - ((arc.centre - radius) * math.cos(math.radians(self.xa(reading)))) + self.width/2
# draw.ellipse([(x0,y0),(x1,y1)],fill ="#ADD8E6", outline ="#ADD8E6")

for value in range(0, self.asi_max + self.step, self.step):
ticklen, width = self.ticklenwidth(value)
arc.line(draw, [(self.xa(value), ticklen), (self.xa(value), 0)], fill=self.fg, width=width)
arc.line(draw, [(self.xa(value), ticklen), (self.xa(value), 0)], fill=self.fg, width=width)

0 comments on commit f1c871b

Please sign in to comment.