Skip to content

Commit

Permalink
Merge the buttons Run and Pause.
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoconni committed Apr 28, 2024
1 parent a020997 commit 23acef4
Showing 1 changed file with 7 additions and 17 deletions.
24 changes: 7 additions & 17 deletions python/UI/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,12 @@ def __init__(self, master: tk.Widget, controller: Controller, **kw):
button_pos = self.step_button.grid_info()
controls_frame.columnconfigure(button_pos["column"], weight=1)

# Run button
self.run_button = ttk.Button(
# Run/Pause button
self.run_pause_button = ttk.Button(
controls_frame, text="Run", command=self.run, state=tk.DISABLED
)
self.run_button.grid(column=1, row=1, sticky=EW, padx=5, pady=5)
button_pos = self.run_button.grid_info()
controls_frame.columnconfigure(button_pos["column"], weight=1)

# Pause button
self.pause_button = ttk.Button(
controls_frame, text="Pause", command=self.pause, state=tk.DISABLED
)
self.pause_button.grid(column=2, row=1, sticky=EW, padx=5, pady=5)
button_pos = self.pause_button.grid_info()
self.run_pause_button.grid(column=1, row=1, sticky=EW, padx=5, pady=5)
button_pos = self.run_pause_button.grid_info()
controls_frame.columnconfigure(button_pos["column"], weight=1)
controls_frame.grid(column=0, row=1, sticky=EW)

Expand All @@ -158,7 +150,7 @@ def run_ic(self):
self.controller.run_ic()
self.property_view.widget.update_values()
self.step_button.config(state=tk.NORMAL)
self.run_button.config(state=tk.NORMAL)
self.run_pause_button.config(state=tk.NORMAL)

def step(self):
self.controller.run()
Expand All @@ -180,12 +172,10 @@ def pause(self) -> None:
self.after_cancel(self.update_id)
self.update_id = None
self.step_button.config(state=tk.NORMAL)
self.run_button.config(state=tk.NORMAL)
self.pause_button.config(state=tk.DISABLED)
self.run_pause_button.config(command=self.run, text="Run")

def run(self) -> None:
self.update_id = self.after(200, self.update)
self.initial_seconds = time.time() - self.controller.fdm.get_sim_time()
self.step_button.config(state=tk.DISABLED)
self.run_button.config(state=tk.DISABLED)
self.pause_button.config(state=tk.NORMAL)
self.run_pause_button.config(command=self.pause, text="Pause")

0 comments on commit 23acef4

Please sign in to comment.