Changeset d4dac80 in sasview for src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

Timestamp:

Apr 25, 2018 6:59:33 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

017b285

Parents:

93c79b5

git-author:

Piotr Rozyczko <rozyczko@…> (03/22/18 16:46:19)

git-committer:

Piotr Rozyczko <rozyczko@…> (04/25/18 06:59:33)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_better_batch

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (1 diff)

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

@@ -358 +358 @@
         elapsed = result[1]
 
-        # ADD THE BATCH FIT VIEW HERE
-        #
+        if result is None:
+            msg = "Fitting failed."
+            self.parent.communicate.statusBarUpdateSignal.emit(msg)
+            return
+
+        # Show the grid panel
+        self.parent.communicate.sendDataToGridSignal.emit(result[0])
 
         msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)