Changeset baeac95 in sasview for src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py

Timestamp:

Nov 14, 2018 5:43:28 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:

ecc5d043

Parents:

e5ae812

Message:

Added Edit to single page constraint SASVIEW-1043

File:

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

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

@@ -20 +20 @@
     Logic class for interacting with MultiConstrainedUI view
     """
-    def __init__(self, parent=None, params=None):
+    def __init__(self, parent=None, params=None, constraint=None):
         """
         parent: ConstraintWidget object
@@ -31 +31 @@
         self.params = params
         self.parent = parent
+        self.function = None
+
+        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
+        else:
+            self.model_name = self.params[1]
 
         self.setupLabels()
@@ -36 +47 @@
 
         # Set param text control to the second parameter passed
-        self.txtConstraint.setText(self.params[1])
-
+        if self.input_constraint is None:
+            self.txtConstraint.setText(self.params[1])
+        else:
+            self.txtConstraint.setText(self.function)
         self.cmdOK.clicked.connect(self.accept)
         self.cmdHelp.clicked.connect(self.onHelp)
@@ -52 +65 @@
         # Switch parameters
         self.params[1], self.params[0] = self.params[0], self.params[1]
+        # change fully qualified param name (e.g. M1.sld -> M1.sld_solvent)
+        self.model_name = self.model_name.replace(self.params[0], self.params[1])
         # Try to swap parameter names in the line edit
         current_text = self.txtConstraint.text()
@@ -64 +79 @@
         Setup labels based on current parameters
         """
-        l1 = self.params[0]
-        l2 = self.params[1]
+        l1 = str(self.params[0])
+        l2 = str(self.params[1])
         self.txtParam1.setText(l1)
         self.txtParam1_2.setText(l1)
@@ -99 +114 @@
             return False
 
-        param_str = str(self.params[1])
-        constraint_text = constraint_text.strip()
+        param_str = self.model_name
 
         # 1. just the parameter