Changeset c5a2722f in sasview for src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

Timestamp:

Jan 18, 2018 9:44:26 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:

ba01ad1

Parents:

2d466e4

Message:

Complex constraint widget updating the main constraint widget and fitting tabs

File:

• src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py (modified) (6 diffs)

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

@@ -15 +15 @@
 # Local UI
 from sas.qtgui.Perspectives.Fitting.UI.ComplexConstraintUI import Ui_ComplexConstraintUI
+from sas.qtgui.Perspectives.Fitting.Constraints import Constraint
 
 class ComplexConstraint(QtWidgets.QDialog, Ui_ComplexConstraintUI):
@@ -52 +53 @@
         self.cmdHelp.clicked.connect(self.onHelp)
         self.cmdRevert.clicked.connect(self.onRevert)
-        #self.txtConstraint.editingFinished.connect(self.validateFormula)
+        self.txtConstraint.editingFinished.connect(self.validateFormula)
 
         self.cbParam1.currentIndexChanged.connect(self.onParamIndexChange)
@@ -95 +96 @@
             self.txtParam.setText(self.tab_names[0] + ":" + self.cbParam1.currentText())
         else:
-            self.txtConstraint.setText(self.cbParam2.currentText())
+            self.txtConstraint.setText(self.tab_names[1] + "." + self.cbParam2.currentText())
         pass
 
@@ -148 +149 @@
             return False
 
-        param_str = str(self.params[1])
+        # M1.scale  --> model_str='M1', constraint_text='scale'
+        param_str = self.cbParam2.currentText()
         constraint_text = constraint_text.strip()
+        model_str = constraint_text[:constraint_text.index('.')]
+        #constraint_text = constraint_text[constraint_text.index('.')+1:]
+
+        # 0. Has to contain the model name
+        if model_str != self.txtName2.text():
+            return False
+
+        # Remove model name from constraint text
+        constraint_text = constraint_text.replace(model_str+".",'')
 
         # 1. just the parameter
@@ -161 +172 @@
         parameter_string_end = parameter_string_start + len(param_str)
 
-        # 3. parameter name should be a separate word, but can have "()[]*+-/ " around
-        valid_neighbours = "()[]*+-/ "
-        has_only_parameter = False
-        start_loc = parameter_string_start -1
-        end_loc = parameter_string_end
-        if not any([constraint_text[start_loc] == char for char in valid_neighbours]):
-            return False
-        if end_loc < len(constraint_text):
-            if not any([constraint_text[end_loc] == char for char in valid_neighbours]):
-                return False
-
-        # 4. replace parameter name with "1" and try to evaluate the expression
+        # 3. replace parameter name with "1" and try to evaluate the expression
         try:
             expression_to_evaluate = constraint_text.replace(param_str, "1.0")
@@ -185 +185 @@
         return True
 
+    def constraint(self):
+        """
+        Return the generated constraint as tuple (model1, param1, operator, constraint)
+        """
+        return (self.txtName1.text(), self.cbParam1.currentText(), self.cbOperator.currentText(), self.txtConstraint.text())
+
     def onHelp(self):
         """