Changeset 09e0c32 in sasview

Timestamp:

Nov 16, 2018 4:44:40 AM (6 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.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ComplexConstraint.py (modified) (1 diff)
• Constraint.py (modified) (1 diff)
• ConstraintWidget.py (modified) (2 diffs)
• FittingWidget.py (modified) (5 diffs)
• MultiConstraint.py (modified) (2 diffs)

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

@@ -82 +82 @@
         ttip = "Add constraints between all identically named parameters in both fitpages"
         self.actionAddAll.setToolTip(ttip)
-        #self.actionAddAll.setStatusTip(ttip)
         self.actionAddAll.triggered.connect(self.onSetAll)
         all_menu.addAction(self.actionAddAll)

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

@@ -12 +12 @@
         self._value_ex = value_ex
         self._func = func
-        self.active = True
         self._min = min
         self._max = max
         self._operator = operator
+        self.validate = True
+        self.active = True
 
     @property

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

@@ -79 +79 @@
         self.tblConstraints.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
         self.tblConstraints.setEnabled(False)
+        header = self.tblConstraints.horizontalHeaderItem(0)
+        header.setToolTip("Double click to edit.")
 
         self.tblConstraints.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
@@ -307 +309 @@
         # No check on function here - trust the user (R)
         if function != constraint.func:
-            #from sas.sascalc.fit.expression import compile_constraints
+            # This becomes rather difficult to validate now.
+            # Turn off validation for Edit Constraint
             constraint.func = function
+            constraint.validate = False
 
     def onTabCellEntered(self, row, column):

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)
 

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())