Changeset 09e0c32 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Nov 16, 2018 6:44:40 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

64b9e61

Parents:

ecc5d043

Message:

Added tooltip on COnstraints table.
Added "validate" parameter to Constraint, allowing for looser validation
of complex, multi-fitpage setups.

File:

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

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

@@ -714 +714 @@
         # what is the parameter to constraint to?
         constraint.value = param_used
+
+        # Should the new constraint be validated?
+        constraint.validate = mc_widget.validate
 
         # Create a new item and add the Constraint object as a child
@@ -843 +846 @@
         constraint.value_ex = updated_param_used
         constraint.value = param_used
+        # Should the new constraint be validated?
+        constraint.validate = mc_widget.validate
 
         # Which row is the constrained parameter in?
@@ -3684 +3689 @@
                 value_ex = constraint.value_ex
                 param = constraint.param
-
-                cons = (value, param, value_ex, func)
-
-            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max, cons])
+                validate = constraint.validate
+
+                cons = (value, param, value_ex, validate, func)
+
+            param_list.append([param_name, param_checked, param_value,param_error, param_min, param_max, cons])
 
         def gatherPolyParams(row):
@@ -3935 +3941 @@
             # constraints
             cons = param_dict[param_name][4+ioffset]
-            if cons is not None and len(cons)==4:
+            if cons is not None and len(cons)==5:
                 value = cons[0]
                 param = cons[1]
                 value_ex = cons[2]
-                function = cons[3]
+                validate = cons[3]
+                function = cons[4]
                 constraint = Constraint()
                 constraint.value = value
@@ -3945 +3952 @@
                 constraint.param = param
                 constraint.value_ex = value_ex
+                constraint.validate = validate
                 self.addConstraintToRow(constraint=constraint, row=row)