Changeset 09e0c32 in sasview for src/sas/qtgui/Perspectives/Fitting/MultiConstraint.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/MultiConstraint.py (modified) (2 diffs)

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

@@ -31 +31 @@
         self.params = params
         self.parent = parent
+        # Text of the constraint
         self.function = None
+        # Should this constraint be validated?
+        self.validate = True
 
         self.input_constraint = constraint
         if self.input_constraint is not None:
             variable = constraint.value
-            #variable = func[func.index('.')+1:]
             self.function = constraint.func
             self.params.append(variable)
             self.model_name = constraint.value_ex
+            # Passed constraint may be too complex for simple validation
+            self.validate = constraint.validate
         else:
             self.model_name = self.params[1]
@@ -97 +101 @@
         Add visual cues when formula is incorrect
         """
+        # Don't validate if requested
+        if not self.validate: return
+
         formula_is_valid = False
         formula_is_valid = self.validateConstraint(self.txtConstraint.text())