JannTer/frontend-dev
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add number_circle

Browse Source
This commit is contained in:
Jannes
2025-10-14 13:59:42 +02:00
parent 98794a36ed
commit f62b790472
10 changed files with 182 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/__main__.py
View File

@@ -94,13 +94,8 @@ class WeightApp(tk.Tk):
def _on_connect(self, connected):
if connected:
# port = self.port.get()
# self.weight_reader.connect(port)
# self.connect_button.config(text="Disconnect")
self.show_device_components()
else:
# self.weight_reader.disconnect()
# self.connect_button.config(text="Connect")
self.hide_device_components()
def update_devices(self):
@@ -110,7 +105,6 @@ class WeightApp(tk.Tk):
self.port.set(self.weight_reader.ports[0])
def update_calib(self):
print(self.calib_weight.get(), self.calib_measurements.get())
self.weight_reader.calib_factor = float(self.calib_weight.get()) / float(self.calib_measurements.get())
def update_view(self):
@@ -132,6 +126,12 @@ class WeightApp(tk.Tk):
calibrate_command=self.calibrate,
padx=50)
self.view.pack(side=tk.RIGHT)
elif selected_view == DISPLAY_TYPES.NUMBER_CIRCLE.value:
self.view = NumberCircleView(self,
tare_command=self.weight_reader.tare,
calibrate_command=self.calibrate,
padx=50)
self.view.pack(side=tk.RIGHT)
else:
raise Exception(f"View {selected_view} not found.")
@@ -139,7 +139,7 @@ class WeightApp(tk.Tk):
weight = self.weight_reader.value
if self.recording:
self.record_window.append((time() - self.record_start, weight))
self.view.update_weight(weight)
self.view.refresh(weight)
self.after(20, self.update_weight_display)
def calibrate(self):
@@ -153,6 +153,7 @@ class WeightApp(tk.Tk):
print(self.weight_reader.calib_window)
self.calib_measurements.delete(0, 'end')
self.calib_measurements.insert(0, mean(self.weight_reader.calib_window))
self.update_calib()
def trigger_record(self):
if self.recording:

6
frontend/config.py
View File

@@ -1,6 +1,7 @@
from enum import Enum
DEFAULT_CALIB = 307333.83
# DEFAULT_CALIB = 307333.83
DEFAULT_CALIB = -105030.71880199667
DEFAULT_CALIB_WEIGHT = 100.
MOV_AVG_DEFAULTS = {
@@ -12,4 +13,5 @@ MOV_AVG_DEFAULTS = {
class DISPLAY_TYPES(Enum):
NUMBER = 'number'
CIRCLE = 'circle'
CIRCLE = 'circle'
NUMBER_CIRCLE = 'number_circle'

3
frontend/views/__init__.py
View File

@@ -1,2 +1,3 @@
from .number import NumberView
from .circle import CircleView
from .circle import CircleView
from .number_circle import NumberCircleView

39
frontend/views/base.py
View File

@@ -1,4 +1,7 @@
from tkinter import ttk, Frame, Canvas
from PIL import Image, ImageDraw
from tkinter import PhotoImage
import io
class View(Frame):
@@ -12,15 +15,37 @@ class View(Frame):
self.tare_button = ttk.Button(self.actions, text="Tare", command=tare_command)
self.tare_button.pack()
self.canvas = Canvas(self, width=144, height=168, background='white')
self.size = (168, 144)
self.center = (168 // 2, 144 // 2)
self.bkg_im = self._init_im()
self._init_ui()
self.canvas = Canvas(self, width=168, height=144, background='white',
highlightthickness=1, highlightbackground="black")
self.canvas.pack()
self.center = (144 // 2, 168 // 2)
self.refresh(0.0)
def _init_ui(self):
pass
self._init_canvas()
def _init_canvas(self):
def _init_im(self):
return Image.new('1', self.size, 'white')
def update_weight(self,
weight: float) -> None:
raise NotImplementedError()
def update_weight(self, weight: float):
raise NotImplementedError()
def refresh(self, weight: float):
# draw weight on bkg_im
im = self.update_weight(weight)
# Convert PIL image to bytes
buffer = io.BytesIO()
im.save(buffer, format='PNG')
buffer.seek(0)
# Load into PhotoImage and display on canvas
self.photo = PhotoImage(data=buffer.getvalue())
self.canvas.delete("all")
self.canvas.create_image(0, 0, anchor="nw", image=self.photo)

46
frontend/views/circle.py
View File

@@ -1,16 +1,12 @@
import tkinter as tk
from tkinter import ttk
from PIL import Image, ImageDraw, ImageChops
from .base import View
class CircleView(View):
def _init_canvas(self):
self.target_r = self.center[0] - 10
self.draw_circle(self.center[0], self.center[1],
self.target_r,
outline="#000000")
def _init_ui(self):
self.target_frame = tk.Frame(self.actions)
self.target_frame.pack()
self.target_label = ttk.Label(self.target_frame, text="Target (g)")
@@ -19,27 +15,31 @@ class CircleView(View):
self.target.insert(0, 100.0)
self.target.pack(side=tk.LEFT)
def draw_circle(self, x, y, r, **kwargs):
self.canvas.create_oval(x-r, y-r, x+r, y+r, **kwargs)
def _init_im(self):
im = Image.new('1', self.size, 'white')
draw = ImageDraw.Draw(im)
self.target_r = min(self.center)-10
draw.circle(self.center, self.target_r,
outline="#000000")
return im
def update_weight(self, weight):
self.canvas.delete("all")
weight_r = 0.0
weight_radius = 0.0
bkg_im = self.bkg_im.copy()
try:
target = float(self.target.get())
weight_r = weight / target * self.target_r
weight_radius = weight / target * self.target_r
self.draw_circle(self.center[0], self.center[1],
weight_r,
fill="#000000")
except:
im = Image.new('1', self.size, 'black')
draw = ImageDraw.Draw(im)
if weight_radius > 0.1:
draw.circle(self.center, weight_radius, fill="#FFFFFF")
return ImageChops.logical_xor(bkg_im, im)
except Exception as e:
print('Invalid target value:', e)
pass
finally:
target_outline = "#000000"
if weight_r > self.target_r:
target_outline = "#FFFFFF"
self.draw_circle(self.center[0], self.center[1],
self.target_r,
outline=target_outline)
return bkg_im

11
frontend/views/number.py
View File

@@ -1,9 +1,12 @@
from PIL import Image, ImageDraw
from .base import View
class NumberView(View):
def _init_canvas(self):
self.label = self.canvas.create_text(50, 68, text="0.0 g", font=("Arial", 18), fill='black', justify='left')
def update_weight(self, weight):
self.canvas.itemconfig(self.label, text=f"{weight:.1f} g")
im = self.bkg_im.copy()
im_draw = ImageDraw.Draw(im)
im_draw.text((50, 68), f"{weight:.1f} g",
fill='black', font_size=24)
return im

48
frontend/views/number_circle.py Normal file
View File

@@ -0,0 +1,48 @@
import tkinter as tk
from tkinter import ttk
from PIL import Image, ImageDraw, ImageChops
from .base import View
class NumberCircleView(View):
def _init_ui(self):
self.target_frame = tk.Frame(self.actions)
self.target_frame.pack()
self.target_label = ttk.Label(self.target_frame, text="Target (g)")
self.target_label.pack(side=tk.LEFT)
self.target = ttk.Entry(self.target_frame)
self.target.insert(0, 100.0)
self.target.pack(side=tk.LEFT)
def _init_im(self):
im = Image.new('1', self.size, 'white')
draw = ImageDraw.Draw(im)
self.target_r = min(self.center)-10
draw.circle(self.center, self.target_r,
outline="#000000")
return im
def update_weight(self, weight):
weight_radius = 0.0
bkg_im = self.bkg_im.copy()
draw = ImageDraw.Draw(bkg_im)
draw.text((50, 68), f"{weight:.1f} g",
fill='black', font_size=24)
try:
target = float(self.target.get())
weight_radius = weight / target * self.target_r
circle_im = Image.new('1', self.size, 'black')
circle_draw = ImageDraw.Draw(circle_im)
if weight_radius > 0.1:
circle_draw.circle(self.center, weight_radius, fill="#FFFFFF")
return ImageChops.logical_xor(bkg_im, circle_im)
except Exception as e:
print('Invalid target value:', e)
pass
return bkg_im