use Parameter when collecting fit values

This commit is contained in:
Dominik Demuth
2023-09-18 11:43:28 +02:00
parent 3af5cb0301
commit 03d172bade
4 changed files with 59 additions and 55 deletions

View File

@ -220,27 +220,31 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
def _prepare(self, model: list, function_use: list = None,
parameter: dict = None, add_idx: bool = False, cnt: int = 0) -> tuple[dict, int]:
if parameter is None:
parameter = {'parameter': {}, 'lb': (), 'ub': (), 'var': [],
'glob': {'idx': [], 'value': [], 'var': [], 'lb': [], 'ub': []},
'links': [], 'color': []}
parameter = {
'parameter': {},
'glob': [],
'links': [],
'color': [],
}
for i, f in enumerate(model):
print(i, f)
if not f['active']:
continue
try:
p, lb, ub, var, glob = self.param_widgets[f['cnt']].get_parameter(function_use)
p, glob = self.param_widgets[f['cnt']].get_parameter(function_use)
except ValueError as e:
_ = QtWidgets.QMessageBox().warning(self, 'Invalid value', str(e),
QtWidgets.QMessageBox.Ok)
return {}, -1
p_len = len(parameter['lb'])
print(p)
print(glob)
p_len = len(p)
parameter['color'].append(f['color'])
parameter['lb'] += lb
parameter['ub'] += ub
parameter['var'] += var
parameter['color'] += [f['color']]
print(parameter)
cnt = f['cnt']