Wire up progress reporting and error markers to code editor.

Refs #21251

qt/python/mantidqt/widgets/codeeditor/interpreter.py

@@ -70,6 +70,7 @@ class PythonFileInterpreterPresenter(QObject):
         # connect signals
         self.model.sig_exec_success.connect(self.on_exec_success)
         self.model.sig_exec_error.connect(self.on_exec_error)
+        self.model.sig_exec_progress.connect(self.view.editor.updateProgressMarker)
 
         # starts idle
         self.view.set_status_message(IDLE_STATUS_MSG)
@@ -83,7 +84,14 @@ class PythonFileInterpreterPresenter(QObject):
         return self.model.execute_async(text)
 
     def on_exec_success(self):
+        self.view.set_editor_readonly(False)
         self.view.set_status_message(IDLE_STATUS_MSG)
 
-    def on_exec_error(self):
+    def on_exec_error(self, task_error):
+        if isinstance(task_error.exception, SyntaxError):
+            lineno = task_error.exception.lineno
+        else:
+            lineno = task_error.stack_entries[-1][1]
+        self.view.editor.updateProgressMarker(lineno, True)
+        self.view.set_editor_readonly(False)
         self.view.set_status_message(IDLE_STATUS_MSG)

qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py

@@ -30,10 +30,10 @@ class MultiPythonFileInterpreter(QWidget):
         super(MultiPythonFileInterpreter, self).__init__(parent)
 
         # layout
-        self.editors = QTabWidget(self)
-        self.editors.setMovable(True)
+        self._editors = QTabWidget(self)
+        self._editors.setMovable(True)
         layout = QVBoxLayout()
-        layout.addWidget(self.editors)
+        layout.addWidget(self._editors)
         self.setLayout(layout)
         layout.setContentsMargins(0, 0, 0, 0)
 
@@ -42,8 +42,16 @@ class MultiPythonFileInterpreter(QWidget):
 
     @property
     def editor_count(self):
-        return self.editors.count()
+        return self._editors.count()
+
+    def current_editor(self):
+        return self._editors.currentWidget()
+
+    def execute_current(self):
+        self.current_editor().execute_all_async()
 
     def append_new_editor(self):
         title = "New"
-        self.editors.addTab(PythonFileInterpreter(self.editors), title)
+        self._editors.addTab(PythonFileInterpreter(self._editors),
+                             title)
+

qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py

@@ -29,11 +29,15 @@ from mantidqt.widgets.codeeditor.multifileinterpreter import MultiPythonFileInte
 @requires_qapp
 class MultiPythonFileInterpreterTest(unittest.TestCase):
 
-    # Success tests
+    def test_default_contains_single_editor(self):
+        widget = MultiPythonFileInterpreter()
+        self.assertEqual(1, widget.editor_count)
 
-    def test_default_contains_single_tab(self):
+    def test_add_editor(self):
         widget = MultiPythonFileInterpreter()
         self.assertEqual(1, widget.editor_count)
+        widget.append_new_editor()
+        self.assertEqual(2, widget.editor_count)
 
 
 if __name__ == '__main__':

qt/python/mantidqt/widgets/src/_widgetscore.sip

@@ -72,6 +72,9 @@ public:
   void setReadOnly(bool ro);
   void setText(const QString &text);
 
+public slots:
+  void updateProgressMarker(int lineno, bool error);
+
 private:
   ScriptEditor(const ScriptEditor&);
 };

qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h

@@ -127,7 +127,7 @@ public slots:
   /// Set the marker state
   void setMarkerState(bool enabled);
   /// Update the progress marker
-  void updateProgressMarker(int lineno, bool error);
+  void updateProgressMarker(int lineno, bool error=false);
   /// Mark the progress arrow as an error
   void markExecutingLineAsError();
   /// Refresh the autocomplete information base on a new set of keywords