Changeset a2cc8b97 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Aug 9, 2018 7:05:47 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

3ae9179, 685e0e3

Parents:

eb0d26c

git-author:

Piotr Rozyczko <rozyczko@…> (08/09/18 07:05:04)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/09/18 07:05:47)

Message:

Bug fix: Bad fit should return a tuple

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -1326 +1326 @@
         Send the finish message from calculate threads to main thread
         """
+        if result is None:
+            result = tuple()
         self.batchFittingFinishedSignal.emit(result)
 
@@ -1335 +1337 @@
         self.setFittingStopped()
 
-        if result is None:
+        if len(result) == 0:
             msg = "Fitting failed."
             self.communicate.statusBarUpdateSignal.emit(msg)
@@ -1395 +1397 @@
         Send the finish message from calculate threads to main thread
         """
+        if result is None:
+            result = tuple()
         self.fittingFinishedSignal.emit(result)
 
@@ -1405 +1409 @@
         self.setFittingStopped()
 
-        if result is None:
+        if len(result) == 0:
             msg = "Fitting failed."
             self.communicate.statusBarUpdateSignal.emit(msg)