Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
78f150eada
@ -228,8 +228,8 @@ class Test(Widget):
|
||||
if action == "change_recipe":
|
||||
self.log.info(f"cycle next: action: {action!r}")
|
||||
self.set_recipe(recipe=None)
|
||||
self.cycle_available_steps["leak_1"].recipe_written=False
|
||||
self.cycle_available_steps["leak_2"].recipe_written=False
|
||||
self.cycle_available_steps["leak_1"].widget.recipe_written = False
|
||||
self.cycle_available_steps["leak_2"].widget.recipe_written = False
|
||||
self.step = Steps(type="select_recipe")
|
||||
self.cycle_index = -1
|
||||
# COUNT RESET
|
||||
@ -317,14 +317,14 @@ class Test(Widget):
|
||||
self.next_timer.start(0)
|
||||
if self.step.type == "done":
|
||||
self.archived = self.done()
|
||||
self.next_timer.start(1000)
|
||||
self.next_timer.start(500)
|
||||
elif self.step.type == "print":
|
||||
compiled_label = self.print(self.archived, self.step.spec.get("template", "EtichettaR5"))
|
||||
self.archived.label = compiled_label
|
||||
self.archived.save()
|
||||
self.next_timer.start(1000)
|
||||
self.next_timer.start(500)
|
||||
elif self.step.type == "wait":
|
||||
self.next_timer.start(1000)
|
||||
self.next_timer.start(500)
|
||||
# UPDATE COUNT DISPLAY
|
||||
self.update_count_display()
|
||||
|
||||
@ -339,6 +339,7 @@ class Test(Widget):
|
||||
|
||||
def set_recipe(self, recipe=None):
|
||||
self.recipe = recipe
|
||||
self.require_discard_piece = False
|
||||
if self.recipe is None:
|
||||
self.cycle_steps = None
|
||||
self.autotest_cycle_steps = None
|
||||
|
||||
Loading…
Reference in New Issue
Block a user