From 0762e14ca06de8a40cad8f6e9634fea86f322aaf Mon Sep 17 00:00:00 2001
From: Matthew Andrew <matthew.andrew@stfc.ac.uk>
Date: Fri, 21 Sep 2018 10:06:23 +0100
Subject: [PATCH] Improved error messages Re #23022
---
scripts/SANS/sans/gui_logic/models/create_state.py | 2 +-
scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/SANS/sans/gui_logic/models/create_state.py b/scripts/SANS/sans/gui_logic/models/create_state.py
index 2cffaa9f6c0..ec4d3e59e7f 100644
--- a/scripts/SANS/sans/gui_logic/models/create_state.py
+++ b/scripts/SANS/sans/gui_logic/models/create_state.py
@@ -47,7 +47,7 @@ def _create_row_state(row, table_model, state_model, facility, instrument, file_
state = gui_state_director.create_state(row, instrument=instrument, file_lookup=file_lookup)
return state
except (ValueError, RuntimeError) as e:
- return "{}".format(row, str(e))
+ return "{}".format(str(e))
def __is_empty_row(row, table):
diff --git a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
index 4e33d37d848..47cda7d1fa6 100644
--- a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
@@ -359,13 +359,14 @@ class RunTabPresenter(object):
selected_rows = self._view.get_selected_rows()
selected_rows = selected_rows if selected_rows else range(self._table_model.get_number_of_rows())
states, errors = self.get_states(row_index=selected_rows)
- if not states:
- raise RuntimeError("There seems to have been an issue with setting the states. Make sure that a user file"
- " has been loaded")
for row, error in errors.items():
self.on_processing_error(row, error)
+ if not states:
+ self.on_processing_finished(None)
+ return
+
# 4. Create the graph if continuous output is specified
if mantidplot:
if self._view.plot_results and not mantidplot.graph(self.output_graph):
--
GitLab