add edit step + do recipe in main view, added carousel for recipe selection
This commit is contained in:
@@ -6,12 +6,12 @@ from PIL import ImageChops
|
||||
|
||||
from ..config import DISPLAY_TYPES, DISPLAY_MODES
|
||||
from .draw_utils import draw_clock
|
||||
from . import NumberView, CircleView, TimerView
|
||||
from . import NumberView, CircleView, TimerView, TextView
|
||||
|
||||
from .button_interface import ButtonInterface
|
||||
from .buttons_manager import ButtonsManager
|
||||
|
||||
from .recipes import RecipeSelection, RecipeManager, EditRecipe, Recipe, EditStep
|
||||
from .recipes import RecipeSelection, RecipeManager, EditRecipe, EditStep, StepType, Step
|
||||
|
||||
class MainView(tk.Frame, ButtonInterface):
|
||||
def __init__(self, parent,
|
||||
@@ -19,6 +19,7 @@ class MainView(tk.Frame, ButtonInterface):
|
||||
calibrate_command=None,
|
||||
**kwargs):
|
||||
super().__init__(parent, **kwargs)
|
||||
self.curr_mode = DISPLAY_MODES.MAIN
|
||||
self.views = []
|
||||
self.timer_view = None # Timer view is always active
|
||||
self.tare_command = tare_command
|
||||
@@ -37,42 +38,73 @@ class MainView(tk.Frame, ButtonInterface):
|
||||
highlightthickness=1, highlightbackground="black")
|
||||
self.canvas.pack()
|
||||
|
||||
|
||||
self.timer_view = TimerView(self.actions, self.im_size, self.center)
|
||||
self.weigh_view = None # Initialize weigh_view to None; will be created if CIRCLE display type is selected
|
||||
self.text_view = TextView(self.actions, self.im_size, self.center)
|
||||
self.buttons = ButtonsManager(self, self.im_size, self.center,
|
||||
curr_view=self)
|
||||
self.recipes_manager = RecipeManager()
|
||||
|
||||
self.curr_mode = DISPLAY_MODES.MAIN
|
||||
self.current_steps = [None] * 3
|
||||
self.tare_buffer = []
|
||||
self.timer_buffer = []
|
||||
self.weigh_target_buffer = []
|
||||
|
||||
def has_button(self):
|
||||
return True, True, True, True
|
||||
|
||||
def left_press(self):
|
||||
self.timer_view.toggle_timer()
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
self.timer_view.toggle_timer()
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
self.previous_recipe_step()
|
||||
|
||||
def left_long_press(self):
|
||||
self.timer_view.reset_timer()
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
self.timer_view.reset_timer()
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
self.exit_recipe()
|
||||
|
||||
def right_press(self):
|
||||
self.tare_command()
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
self.tare_command()
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
self.next_recipe_step()
|
||||
|
||||
def right_long_press(self):
|
||||
if self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
return
|
||||
self.enter_recipe_selection()
|
||||
|
||||
|
||||
def render_left_press(self, draw, x, y):
|
||||
draw_clock(draw, (x, y), radius=3)
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
draw_clock(draw, (x, y), radius=3)
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
if self.current_steps[0] is not None:
|
||||
draw.regular_polygon((x, y, 5), 3, fill='black', rotation=210)
|
||||
draw.text((x + 6, y - 5), self.current_steps[0].value_str, fill='black')
|
||||
|
||||
def render_left_long_press(self, draw, x, y):
|
||||
draw_clock(draw, (x, y), radius=3)
|
||||
draw.text((x + 6, y - 5), "0.0", fill='black')
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
draw_clock(draw, (x, y), radius=3)
|
||||
draw.text((x + 6, y - 5), "0.0", fill='black')
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
draw.text((x, y - 5), "Exit", fill='black')
|
||||
|
||||
def render_right_press(self, draw, x, y):
|
||||
draw.text((x, y), "T", fill='black')
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
draw.text((x, y), "T", fill='black')
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
if self.current_steps[2] is not None:
|
||||
draw.regular_polygon((x, y+5, 5), 3, fill='black', rotation=30)
|
||||
value = self.current_steps[2].value_str
|
||||
draw.text((x - 6 * len(value) - 5, y), value, fill='black')
|
||||
else:
|
||||
draw.text((x - 24, y), "Done", fill='black')
|
||||
|
||||
def render_right_long_press(self, draw, x, y):
|
||||
draw.text((x, y - 5), "R", fill='black')
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
draw.text((x, y - 5), "R", fill='black')
|
||||
|
||||
|
||||
def enter_main_mode(self):
|
||||
@@ -86,9 +118,18 @@ class MainView(tk.Frame, ButtonInterface):
|
||||
self.im_size, self.center,
|
||||
recipe_manager=self.recipes_manager,
|
||||
edit_recipe_command=self.enter_edit_recipe,
|
||||
run_recipe_command=self.enter_do_recipe,
|
||||
deactivate_command=self.enter_main_mode)
|
||||
self.refresh(0.0)
|
||||
|
||||
def enter_do_recipe(self, recipe_id: int):
|
||||
self.curr_mode = DISPLAY_MODES.DO_RECIPE
|
||||
self.timer_view.reset_timer() # Reset timer at start of recipe
|
||||
self.recipes_manager.activate_recipe(recipe_id)
|
||||
self.current_steps = self.recipes_manager.get_current_step()
|
||||
self.buttons.current_view = self
|
||||
self.refresh(0.0)
|
||||
|
||||
def enter_edit_recipe(self, recipe_id: int = None):
|
||||
self.curr_mode = DISPLAY_MODES.EDIT_RECIPE
|
||||
self.buttons.current_view = EditRecipe(self,
|
||||
@@ -109,6 +150,77 @@ class MainView(tk.Frame, ButtonInterface):
|
||||
deactivate_command=lambda: self.enter_edit_recipe(recipe_id))
|
||||
self.refresh(0.0)
|
||||
|
||||
|
||||
##### Recipe navigation in DO_RECIPE mode #####
|
||||
def next_recipe_step(self):
|
||||
self.current_steps = self.recipes_manager.next_step()
|
||||
if self.current_steps[1] is None:
|
||||
self.exit_recipe()
|
||||
return
|
||||
|
||||
self.do_recipe_step(self.current_steps[1])
|
||||
self.refresh(0.0)
|
||||
|
||||
def previous_recipe_step(self):
|
||||
self.current_steps = self.recipes_manager.previous_step()
|
||||
self.do_recipe_step(self.current_steps[1], reverse=True)
|
||||
self.refresh(0.0)
|
||||
|
||||
def exit_recipe(self):
|
||||
self.recipes_manager.deactivate_recipe()
|
||||
self.timer_view.reset_timer()
|
||||
self.weigh_view.target = 0.0
|
||||
self.weigh_target_buffer.clear()
|
||||
self.timer_buffer.clear()
|
||||
self.tare_buffer.clear()
|
||||
self.enter_main_mode()
|
||||
|
||||
def do_recipe_step(self, step: Step, reverse=False):
|
||||
if step is None:
|
||||
return
|
||||
|
||||
last_step = self.current_steps[0]
|
||||
if last_step is not None and last_step.step_type == StepType.WEIGH_WITH_TIMER and not reverse:
|
||||
self.timer_view.goal_secs = 0.0
|
||||
elif last_step is not None and last_step.step_type == StepType.SECTION and not reverse:
|
||||
self.weigh_view.target = 0.0
|
||||
self.timer_view.goal_secs = 0.0
|
||||
|
||||
|
||||
if step.step_type == StepType.TARE:
|
||||
if not reverse:
|
||||
tare_weight = self.tare_command()
|
||||
self.tare_buffer.append(tare_weight) # buffer last tare weight in case we need to revert
|
||||
elif self.tare_buffer:
|
||||
tare_weight = self.tare_buffer.pop()
|
||||
self.tare_command(tare_weight)
|
||||
else:
|
||||
raise ValueError("Tare buffer is empty, cannot revert tare step")
|
||||
|
||||
elif step.step_type == StepType.WEIGH:
|
||||
if not reverse:
|
||||
self.weigh_view.target = step.value
|
||||
self.weigh_target_buffer.append(step.value)
|
||||
else:
|
||||
if self.weigh_target_buffer:
|
||||
self.weigh_view.target = self.weigh_target_buffer.pop()
|
||||
else:
|
||||
self.weigh_view.target = 0.0
|
||||
elif step.step_type == StepType.WEIGH_WITH_TIMER:
|
||||
if not reverse:
|
||||
self.timer_view.reset_timer()
|
||||
self.timer_view.goal_secs = step.goal_time if step.goal_time > 0 else 0
|
||||
self.timer_view.toggle_timer()
|
||||
self.weigh_view.target = step.value
|
||||
self.weigh_target_buffer.append(step.value)
|
||||
else:
|
||||
self.timer_view.reset_timer()
|
||||
if self.weigh_target_buffer:
|
||||
self.weigh_view.target = self.weigh_target_buffer.pop()
|
||||
else:
|
||||
self.weigh_view.target = 0.0
|
||||
|
||||
|
||||
################ VIEW MANAGEMENT ################
|
||||
|
||||
def update_views(self, selected_types: DISPLAY_TYPES):
|
||||
@@ -123,25 +235,41 @@ class MainView(tk.Frame, ButtonInterface):
|
||||
self.views.append(number_view)
|
||||
|
||||
if selected_types & DISPLAY_TYPES.CIRCLE:
|
||||
circle_view = CircleView(self.actions, self.im_size, self.center)
|
||||
self.views.append(circle_view)
|
||||
self.weigh_view = CircleView(self.actions, self.im_size, self.center)
|
||||
self.views.append(self.weigh_view)
|
||||
|
||||
|
||||
def refresh(self, weight: float):
|
||||
ims = []
|
||||
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN:
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN or self.curr_mode == DISPLAY_MODES.DO_RECIPE:
|
||||
# Always include timer and button view
|
||||
if self.timer_view:
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN or \
|
||||
(self.current_steps[1] is not None and \
|
||||
self.current_steps[1].step_type != StepType.SECTION):
|
||||
timer_im = self.timer_view.update_weight(weight)
|
||||
button_im = self.buttons.update_weight(weight)
|
||||
ims.append(timer_im)
|
||||
ims.append(button_im)
|
||||
elif self.curr_mode == DISPLAY_MODES.DO_RECIPE and \
|
||||
self.current_steps[1].step_type == StepType.SECTION:
|
||||
if self.current_steps[1] is None:
|
||||
self.text_view.set_text("Enjoy")
|
||||
else:
|
||||
# In recipe mode, if current step is a section, show a blank screen instead of timer
|
||||
self.text_view.set_text(self.current_steps[1].value_str)
|
||||
|
||||
text_im = self.text_view.update_weight(weight)
|
||||
ims.append(text_im)
|
||||
|
||||
button_im = self.buttons.update_weight(weight)
|
||||
ims.append(button_im)
|
||||
|
||||
# Add other selected views
|
||||
for view in self.views:
|
||||
im = view.update_weight(weight)
|
||||
ims.append(im)
|
||||
if self.curr_mode == DISPLAY_MODES.MAIN or \
|
||||
self.current_steps[1] is None or \
|
||||
self.current_steps[1].step_type != StepType.SECTION:
|
||||
# Add other selected views
|
||||
for view in self.views:
|
||||
im = view.update_weight(weight)
|
||||
ims.append(im)
|
||||
|
||||
else:
|
||||
button_im = self.buttons.update_weight(weight)
|
||||
|
||||
Reference in New Issue
Block a user