If queued experiment is stopped it is now deleted from queue so that the queue is no longer blocked.
This commit is contained in:
parent
7dc963143d
commit
98e9651538
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user