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

Timestamp:

Feb 8, 2018 8:37:28 AM (7 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:

731efec

Parents:

725d9c06

git-author:

Piotr Rozyczko <rozyczko@…> (02/08/18 08:32:10)

git-committer:

Piotr Rozyczko <rozyczko@…> (02/08/18 08:37:28)

Message:

Simple vs. complex constraints behaviour fixed.

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (2 diffs)

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

@@ -294 +294 @@
         self.parent.fittingStoppedSignal.emit(self.getTabsForFit())
 
+        # Assure the fitting succeeded
+        if result is None or not result:
+            msg = "Fitting failed. Please ensure correctness of chosen constraints."
+            self.parent.communicate.statusBarUpdateSignal.emit(msg)
+            return
+
         # get the elapsed time
         elapsed = result[1]
@@ -553 +559 @@
 
         # Check if any constraints present in tab
-        constraint_names = fit_page.getConstraintsForModel()
+        constraint_names = fit_page.getComplexConstraintsForModel()
         constraints = fit_page.getConstraintObjectsForModel()
         if not constraints: