Skip to content
Snippets Groups Projects
Commit c73be756 authored by Lan Dam's avatar Lan Dam
Browse files

return -1 if user select Abort in multi button dialog

parent 7379932b
No related branches found
No related tags found
2 merge requests!190let user select one of the folders data/, sdata/,!189Fix return when user select Abort in multi button dialog
Pipeline #3032 passed with stage
in 2 minutes and 13 seconds
...@@ -129,6 +129,10 @@ class MSeed(GeneralData): ...@@ -129,6 +129,10 @@ class MSeed(GeneralData):
"Please select one to display") "Please select one to display")
self.pause_signal.emit(msg, sta_ids) self.pause_signal.emit(msg, sta_ids)
self.pause() self.pause()
if self.pause_response == -1:
self.track_info('Process is cancelled by user.',
LogType.WARNING)
return
selected_sta_id = sta_ids[self.pause_response] selected_sta_id = sta_ids[self.pause_response]
self.track_info(f'Select Station {selected_sta_id}', LogType.INFO) self.track_info(f'Select Station {selected_sta_id}', LogType.INFO)
......
...@@ -155,6 +155,10 @@ class RT130(GeneralData): ...@@ -155,6 +155,10 @@ class RT130(GeneralData):
"Please select one to display") "Please select one to display")
self.pause_signal.emit(msg, keys) self.pause_signal.emit(msg, keys)
self.pause() self.pause()
if self.pause_response == -1:
self.track_info('Process is cancelled by user.',
LogType.WARNING)
return
selected_key = keys[self.pause_response] selected_key = keys[self.pause_response]
self.track_info(f'Select Key {selected_key}', LogType.INFO) self.track_info(f'Select Key {selected_key}', LogType.INFO)
......
...@@ -34,13 +34,7 @@ def create_multi_buttons_dialog( ...@@ -34,13 +34,7 @@ def create_multi_buttons_dialog(
msg_box.exec_() msg_box.exec_()
if msg_box.clickedButton() == abort_button: if msg_box.clickedButton() == abort_button:
if abort_is_0: chosen_idx = -1
# The default choice is the first item, so we default to it if the
# user presses the abort button. An alternative choice is to stop
# when the user presses the abort button.
chosen_idx = 0
else:
chosen_idx = -1
else: else:
chosen_idx = buttons.index(msg_box.clickedButton()) chosen_idx = buttons.index(msg_box.clickedButton())
return chosen_idx return chosen_idx
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment