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

Timestamp:

Jan 19, 2018 8:02:09 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:

0764593

Parents:

c5a2722f

Message:

Added batch fit constraints.
Cleaned up interactions between constraints in various tabs

File:

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

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

@@ -152 +152 @@
         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:]
+        model_str = self.txtName2.text()
 
         # 0. Has to contain the model name
@@ -159 +158 @@
             return False
 
-        # Remove model name from constraint text
+        # Remove model name from constraint
         constraint_text = constraint_text.replace(model_str+".",'')