From 98e96515385305819c1955ede6727bafcc6d4de4 Mon Sep 17 00:00:00 2001 From: Joachim Beerwerth Date: Tue, 10 Apr 2018 09:43:30 +0200 Subject: [PATCH] If queued experiment is stopped it is now deleted from queue so that the queue is no longer blocked. --- src/gui/DamarisGUI.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py index 46e2946..8228a20 100644 --- a/src/gui/DamarisGUI.py +++ b/src/gui/DamarisGUI.py @@ -472,7 +472,16 @@ class DamarisGUI: loop_run += interval if self.stop_experiment_flag.isSet(): + #Experiment has been stopped, clean up and leave self.experiment_script_statusbar_label.set_text("Experiment stopped") + self.state = DamarisGUI.Edit_State + self.sw.enable_editing( ) + self.toolbar_run_button.set_sensitive( True ) + self.toolbar_stop_button.set_sensitive( False ) + self.toolbar_pause_button.set_sensitive( False ) + self.toolbar_pause_button.set_active( False ) + #delete experiment from queue so that next experiment may start + self.lockfile.del_experiment(self.id) return # start experiment @@ -519,6 +528,8 @@ class DamarisGUI: self.toolbar_stop_button.set_sensitive( False ) self.toolbar_pause_button.set_sensitive( False ) self.toolbar_pause_button.set_active( False ) + #delete Experiment from queue + self.lockfile.del_experiment(self.id) return # switch to grapics