diff --git a/qt/applications/workbench/workbench/plugins/workspacewidget.py b/qt/applications/workbench/workbench/plugins/workspacewidget.py index 3f83632fe74baf3d36b526f4012cb1152fa6e0f8..a736c0ad1d6d249709a48c6f283816a4f300081b 100644 --- a/qt/applications/workbench/workbench/plugins/workspacewidget.py +++ b/qt/applications/workbench/workbench/plugins/workspacewidget.py @@ -17,6 +17,7 @@ from qtpy.QtWidgets import QMessageBox, QVBoxLayout # third-party library imports from mantid.api import AnalysisDataService +from mantid.kernel import logger from mantidqt.widgets.instrumentview.presenter import InstrumentViewPresenter from mantidqt.widgets.matrixworkspacedisplay.presenter import MatrixWorkspaceDisplay from mantidqt.widgets.samplelogs.presenter import SampleLogs @@ -135,7 +136,8 @@ class WorkspaceWidget(PluginWidget): presenter = TableWorkspaceDisplay(ws, plot=matplotlib.pyplot, parent=self) presenter.view.show() except ValueError as x: - raise x + logger.error( + "Could not open workspace: {0} with either MatrixWorkspaceDisplay nor TableWorkspaceDisplay.") def _action_double_click_workspace(self, name): self._do_show_data([name]) diff --git a/qt/python/mantidqt/widgets/tableworkspacedisplay/error_column.py b/qt/python/mantidqt/widgets/tableworkspacedisplay/error_column.py index b91080ea0140d3ebd02a72f2028e02a65286002e..481a8b98b75cff82ec00b75e08365b8b0d5607d6 100644 --- a/qt/python/mantidqt/widgets/tableworkspacedisplay/error_column.py +++ b/qt/python/mantidqt/widgets/tableworkspacedisplay/error_column.py @@ -1,3 +1,14 @@ +# Mantid Repository : https://github.com/mantidproject/mantid +# +# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI, +# NScD Oak Ridge National Laboratory, European Spallation Source +# & Institut Laue - Langevin +# SPDX - License - Identifier: GPL - 3.0 + +# This file is part of the mantid workbench. +# +# + + class ErrorColumn: def __init__(self, column, error_for_column, label_index): self.column = column diff --git a/qt/python/mantidqt/widgets/tableworkspacedisplay/marked_columns.py b/qt/python/mantidqt/widgets/tableworkspacedisplay/marked_columns.py index 3a15aad7cf27a7ce217c02297f127b8c328272c2..8c30c53d3e2fdd01d721a199cefed8c6d27b4493 100644 --- a/qt/python/mantidqt/widgets/tableworkspacedisplay/marked_columns.py +++ b/qt/python/mantidqt/widgets/tableworkspacedisplay/marked_columns.py @@ -1,3 +1,14 @@ +# Mantid Repository : https://github.com/mantidproject/mantid +# +# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI, +# NScD Oak Ridge National Laboratory, European Spallation Source +# & Institut Laue - Langevin +# SPDX - License - Identifier: GPL - 3.0 + +# This file is part of the mantid workbench. +# +# + + class MarkedColumns: X_LABEL = "[X{}]" Y_LABEL = "[Y{}]"