add button manager
This commit is contained in:
@@ -6,6 +6,7 @@ from PIL import ImageChops
|
||||
|
||||
from ..config import DISPLAY_TYPES
|
||||
from . import NumberView, CircleView, TimerView
|
||||
from .buttons_manager import ButtonsManager
|
||||
|
||||
class MainView(tk.Frame):
|
||||
def __init__(self, parent,
|
||||
@@ -18,13 +19,6 @@ class MainView(tk.Frame):
|
||||
self.tare_command = tare_command
|
||||
self.calibrate_command = calibrate_command
|
||||
|
||||
# Button press detection variables
|
||||
self.left_press_start = None
|
||||
self.right_press_start = None
|
||||
self.long_press_threshold = 1000 # 1 second in milliseconds
|
||||
self.left_press_job = None
|
||||
self.right_press_job = None
|
||||
|
||||
self.actions = Frame(self)
|
||||
self.actions.pack()
|
||||
self.calibrate_button = ttk.Button(self.actions, text="Calibrate", command=calibrate_command)
|
||||
@@ -43,19 +37,10 @@ class MainView(tk.Frame):
|
||||
highlightthickness=1, highlightbackground="black")
|
||||
self.canvas.pack()
|
||||
|
||||
self.device_frame = Frame(self.actions)
|
||||
self.left_button = ttk.Button(self.device_frame, text="Left")
|
||||
# Bind mouse events for press detection
|
||||
self.left_button.bind("<Button-1>", self._left_button_press_start)
|
||||
self.left_button.bind("<ButtonRelease-1>", self._left_button_press_end)
|
||||
self.left_button.pack(side="left")
|
||||
|
||||
self.right_button = ttk.Button(self.device_frame, text="Right")
|
||||
# Bind mouse events for press detection
|
||||
self.right_button.bind("<Button-1>", self._right_button_press_start)
|
||||
self.right_button.bind("<ButtonRelease-1>", self._right_button_press_end)
|
||||
self.right_button.pack(side="right")
|
||||
self.device_frame.pack()
|
||||
self.buttons = ButtonsManager(self, self.im_size, self.center,
|
||||
tare_command=self.tare_command,
|
||||
start_timer_command=self.timer_view.toggle_timer,
|
||||
reset_timer_command=self.timer_view.reset_timer)
|
||||
|
||||
|
||||
################ VIEW MANAGEMENT ################
|
||||
@@ -79,10 +64,12 @@ class MainView(tk.Frame):
|
||||
def refresh(self, weight: float):
|
||||
ims = []
|
||||
|
||||
# Always include timer view
|
||||
# Always include timer and button view
|
||||
if self.timer_view:
|
||||
timer_im = self.timer_view.update_weight(weight)
|
||||
button_im = self.buttons.update_weight(weight)
|
||||
ims.append(timer_im)
|
||||
ims.append(button_im)
|
||||
|
||||
# Add other selected views
|
||||
for view in self.views:
|
||||
@@ -111,58 +98,3 @@ class MainView(tk.Frame):
|
||||
|
||||
########### BUTTON PRESS HANDLING ###########
|
||||
|
||||
def _left_button_press_start(self, event):
|
||||
"""Handle left button press start"""
|
||||
self.left_press_start = self.after_idle(lambda: None) # Get current time reference
|
||||
# Schedule long press detection
|
||||
self.left_press_job = self.after(self.long_press_threshold, self._left_long_press_detected)
|
||||
|
||||
def _left_button_press_end(self, event):
|
||||
"""Handle left button press end"""
|
||||
if self.left_press_job:
|
||||
self.after_cancel(self.left_press_job)
|
||||
self.left_press_job = None
|
||||
# If we get here, it was a short press
|
||||
self.left_button_press()
|
||||
self.left_press_start = None
|
||||
|
||||
def _left_long_press_detected(self):
|
||||
"""Called when long press threshold is reached for left button"""
|
||||
self.left_press_job = None
|
||||
self.left_button_long_press()
|
||||
|
||||
def _right_button_press_start(self, event):
|
||||
"""Handle right button press start"""
|
||||
self.right_press_start = self.after_idle(lambda: None) # Get current time reference
|
||||
# Schedule long press detection
|
||||
self.right_press_job = self.after(self.long_press_threshold, self._right_long_press_detected)
|
||||
|
||||
def _right_button_press_end(self, event):
|
||||
"""Handle right button press end"""
|
||||
if self.right_press_job:
|
||||
self.after_cancel(self.right_press_job)
|
||||
self.right_press_job = None
|
||||
# If we get here, it was a short press
|
||||
self.right_button_press()
|
||||
self.right_press_start = None
|
||||
|
||||
def _right_long_press_detected(self):
|
||||
"""Called when long press threshold is reached for right button"""
|
||||
self.right_press_job = None
|
||||
self.right_button_long_press()
|
||||
|
||||
|
||||
############ BUTTON ACTIONS ###########
|
||||
|
||||
def left_button_press(self):
|
||||
self.timer_view.toggle_timer()
|
||||
|
||||
def left_button_long_press(self):
|
||||
self.timer_view.reset_timer()
|
||||
|
||||
|
||||
def right_button_press(self):
|
||||
self.tare_command()
|
||||
|
||||
def right_button_long_press(self):
|
||||
pass
|
||||
Reference in New Issue
Block a user