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

Timestamp:

Mar 21, 2018 4:17:04 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:

8b480d27

Parents:

e4c475b7

git-author:

Piotr Rozyczko <rozyczko@…> (02/08/18 04:19:04)

git-committer:

Piotr Rozyczko <rozyczko@…> (03/21/18 04:17:04)

Message:

Merging feature branches

File:

• src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py (modified) (1 diff)

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

@@ -114 +114 @@
 
         # 3. parameter name should be a separate word, but can have "()[]*+-/ " around
-        valid_neighbours = "()[]*+-/ "
-        start_loc = parameter_string_start -1
-        end_loc = parameter_string_end
-        if not any([constraint_text[start_loc] == ch for ch in valid_neighbours]):
-            return False
-        if end_loc < len(constraint_text):
-            if not any([constraint_text[end_loc] == ch for ch in valid_neighbours]):
-                return False
+        #valid_neighbours = "()[]*+-/ "
+        #start_loc = parameter_string_start -1
+        #end_loc = parameter_string_end
+        #if not any([constraint_text[start_loc] == ch for ch in valid_neighbours]):
+        #    return False
+        #if end_loc < len(constraint_text):
+        #    if not any([constraint_text[end_loc] == ch for ch in valid_neighbours]):
+        #        return False
 
         # 4. replace parameter name with "1" and try to evaluate the expression