use Parameter when collecting fit values

src/gui_qt/fit/fitwindow.py

@@ -9,6 +9,7 @@ import numpy as np
 from pyqtgraph import mkPen
 
 from nmreval.fit._meta import MultiModel, ModelFactory
+from nmreval.fit.model import Model
 from nmreval.fit.result import FitResult
 
 from .fit_forms import FitTableWidget
@@ -219,16 +220,16 @@ 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': {},
-                'glob': [],
+                'data_parameter': {},
+                'global_parameter': [],
                 'links': [],
                 'color': [],
             }
 
         for i, f in enumerate(model):
-            print(i, f)
             if not f['active']:
                 continue
 
@@ -239,33 +240,22 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
                                                     QtWidgets.QMessageBox.Ok)
                 return {}, -1
 
-            print(p)
-            print(glob)
-            p_len = len(p)
             parameter['color'].append(f['color'])
-
-            print(parameter)
+            parameter['global_parameter'].extend(glob)
 
             cnt = f['cnt']
-
             for p_k, v_k in p.items():
                 if add_idx:
                     kw_k = {f'{k}_{cnt}': v for k, v in v_k[1].items()}
                 else:
                     kw_k = v_k[1]
 
-                if p_k in parameter['parameter']:
-                    params, kw = parameter['parameter'][p_k]
+                if p_k in parameter['data_parameter']:
+                    params, kw = parameter['data_parameter'][p_k]
                     params += v_k[0]
                     kw.update(kw_k)
                 else:
-                    parameter['parameter'][p_k] = (v_k[0], kw_k)
-
-            for g_k, g_v in glob.items():
-                if g_k != 'idx':
-                    parameter['glob'][g_k] += g_v
-                else:
-                    parameter['glob']['idx'] += [idx_i + p_len for idx_i in g_v]
+                    parameter['data_parameter'][p_k] = (v_k[0], kw_k)
 
             if add_idx:
                 cnt += 1
@@ -283,37 +273,43 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
         data = self.data_table.collect_data(default=self.default_combobox.currentData())
 
         func_dict = {}
-        for k, mod in self.models.items():
-            func, order, param_len = ModelFactory.create_from_list(mod)
+        for model_name, model_parameter in self.models.items():
+            func, order, param_len = ModelFactory.create_from_list(model_parameter)
 
             if func is None:
                 continue
 
-            if k in data:
-                parameter, _ = self._prepare(mod, function_use=data[k], add_idx=isinstance(func, MultiModel))
+            func = Model(func)
 
-                # convert positions of global parameter to corresponding names
-                global_parameter: dict = parameter['glob']
-                positions = global_parameter.pop('idx')
-                global_parameter['key'] = [pname for i, pname in enumerate(func.params) if i in positions]
-                # print(global_parameter)
+            if model_name in data:
+                parameter, _ = self._prepare(model_parameter, function_use=data[model_name], add_idx=isinstance(func, MultiModel))
 
                 if parameter is None:
                     return
 
+                for (data_parameter, _) in parameter['data_parameter'].values():
+                    for pname, param in zip(func.params, data_parameter):
+                        param.name = pname
+
+                if self._complex[model_name] is not None:
+                    for p_k, p_v in parameter['data_parameter'].items():
+                        p_v[1].update({'complex_mode': self._complex[model_name]})
+                        parameter['data_parameter'][p_k] = p_v[0], p_v[1]
+
+                for pname, param_value in zip(func.params, parameter['global_parameter']):
+                    if param_value is not None:
+                        param_value.name = pname
+                        func.set_global_parameter(param_value)
+
                 parameter['func'] = func
                 parameter['order'] = order
                 parameter['len'] = param_len
-                parameter['complex'] = self._complex[k]
-                if self._complex[k] is not None:
-                    for p_k, p_v in parameter['parameter'].items():
-                        p_v[1].update({'complex_mode': self._complex[k]})
-                        parameter['parameter'][p_k] = p_v[0], p_v[1]
+                parameter['complex'] = self._complex[model_name]
 
-                func_dict[k] = parameter
+                func_dict[model_name] = parameter
 
         replaceable = []
-        for k, v in func_dict.items():
+        for model_name, v in func_dict.items():
             for i, link_i in enumerate(v['links']):
                 if link_i is None:
                     continue
@@ -344,7 +340,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
                                                         QtWidgets.QMessageBox.Ok)
                     return
 
-                replaceable.append((k, i, rep_model, repl_idx))
+                replaceable.append((model_name, i, rep_model, repl_idx))
 
                 replace_value = None
                 for p_k in f['parameter'].values():