From 627299fc3badedb11643ad7e042aa153b6538952 Mon Sep 17 00:00:00 2001 From: Miguel Angel Gonzalez Date: Wed, 17 Jan 2024 18:39:20 +0100 Subject: [PATCH 1/2] Fixes issue #2356 --- src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py b/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py index 8971b0a265..82815c08a4 100644 --- a/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py +++ b/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py @@ -357,10 +357,10 @@ def onSetAll(self): # loop over parameters in constrained model index1 = self.cbModel1.currentIndex() index2 = self.cbModel2.currentIndex() - items1 = self.tabs[index1].kernel_module.params - items2 = self.params[index2] + items1 = self.tabs[index1].main_params_to_fit + self.tabs[index1].poly_params_to_fit + items2 = self.tabs[index2].main_params_to_fit + self.tabs[index2].poly_params_to_fit # create an empty list to store redefined constraints - redefined_constraints = [] +git redefined_constraints = [] for item in items1: if item not in items2: continue param = item From 3eb3e0a1aca1a339a9e27f1659a5a409e04df61f Mon Sep 17 00:00:00 2001 From: Miguel Angel Gonzalez Date: Wed, 17 Jan 2024 18:59:08 +0100 Subject: [PATCH 2/2] Fix typo --- src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py b/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py index 82815c08a4..f25e513296 100644 --- a/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py +++ b/src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py @@ -360,7 +360,7 @@ def onSetAll(self): items1 = self.tabs[index1].main_params_to_fit + self.tabs[index1].poly_params_to_fit items2 = self.tabs[index2].main_params_to_fit + self.tabs[index2].poly_params_to_fit # create an empty list to store redefined constraints -git redefined_constraints = [] + redefined_constraints = [] for item in items1: if item not in items2: continue param = item