Merge pull request #36269 from mantidproject/36265_handle_errors_in_f…

…itting Reenable error handling in FitPropertyBrowser
mantidproject · Oct 10, 2023 · b75cfaa · b75cfaa
2 parents 6ed7167 + 6dd21e2
commit b75cfaa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...gineering/gui/engineering_diffraction/tabs/fitting/plotting/EngDiff_fitpropertybrowser.py b/...gineering/gui/engineering_diffraction/tabs/fitting/plotting/EngDiff_fitpropertybrowser.py
@@ -35,6 +35,7 @@ def __init__(self, canvas, toolbar_manager, parent=None):
         self.fit_enabled_notifier = GenericObservable()
         self.fit_started_notifier = GenericObservable()
         self.algorithmStarted.connect(self.fitting_started_slot)
+        self.algorithmFailed.connect(self.fitting_failed_slot)
 
     def set_output_window_names(self):
         """
@@ -151,13 +152,17 @@ def fitting_done_slot(self, name):
         This is called after Fit finishes to update the fit curves.
         :param name: The name of Fit's output workspace.
         """
-        if not name:
-            self.fit_notifier.notify_subscribers([])
-            return
         super(EngDiffFitPropertyBrowser, self).fitting_done_slot(name)
         self.save_current_setup(self.workspaceName())
         self.fit_notifier.notify_subscribers([self.get_fitprop()])
 
+    @Slot()
+    def fitting_failed_slot(self):
+        """
+        This is called after Fit fails due to an exception thrown.
+        """
+        self.fit_notifier.notify_subscribers([])
+
     @Slot()
     def function_changed_slot(self):
         """

diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h
@@ -333,6 +333,7 @@ public slots:
   void currentChanged() const;
   void functionRemoved();
   void algorithmFinished(const QString & /*_t1*/);
+  void algorithmFailed();
   void algorithmStarted(const QString & /*_t1*/);
   void workspaceIndexChanged(int index);
   void updatePlotSpectrum(int index);

diff --git a/qt/widgets/common/src/FitPropertyBrowser.cpp b/qt/widgets/common/src/FitPropertyBrowser.cpp
@@ -1641,7 +1641,7 @@ void FitPropertyBrowser::doFit(int maxIterations) {
       QCoreApplication::processEvents();
     }
     if (!result.error().empty()) {
-      emit algorithmFinished(QString());
+      emit algorithmFailed();
     }
   } catch (const std::exception &e) {
     QString msg = "Fit algorithm failed.\n\n" + QString(e.what()) + "\n";