Merge branch 'fit'

src/gui_qt/fit/fit_parameter.py

@@ -181,6 +181,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         for i, value in enumerate(self.data_values[sid]):
             w = self.data_parameter[i]
             w.blockSignals(True)
+            w.show_as_local_parameter(value is not None)
             if value is None:
                 w.value = self.glob_values[i]
             else:
@@ -293,6 +294,7 @@ class ParameterSingleWidget(QtWidgets.QWidget):
 
         self._name = name
         self.label.setText(convert(name))
+        self.label.setToolTip('IIf this is bold then this parameter is only for this data. otherwise the general parameter is used and displayed')
 
         self.value_line.setValidator(QtGui.QDoubleValidator())
         self.value_line.textChanged.connect(lambda: self.valueChanged.emit(self.value) if self.value is not None else 0)
@@ -309,10 +311,12 @@ class ParameterSingleWidget(QtWidgets.QWidget):
         layout.addSpacerItem(QtWidgets.QSpacerItem(0, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
 
         self.value_line = QtWidgets.QLineEdit(self)
+        self.value_line.textEdited.connect(lambda x: self.show_as_local_parameter(True))
         layout.addWidget(self.value_line)
 
         self.reset_button = QtWidgets.QToolButton(self)
         self.reset_button.setText('Use global')
+        self.reset_button.clicked.connect(lambda: self.show_as_local_parameter(False))
         layout.addWidget(self.reset_button)
 
         self.setLayout(layout)
@@ -327,3 +331,9 @@ class ParameterSingleWidget(QtWidgets.QWidget):
     @value.setter
     def value(self, val):
         self.value_line.setText(f'{float(val):.5g}')
+
+    def show_as_local_parameter(self, is_local):
+        if is_local:
+            self.label.setStyleSheet('font-weight: bold;')
+        else:
+            self.label.setStyleSheet('')

src/gui_qt/fit/result.py

@@ -113,8 +113,8 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
 
         res = self._results[set_id]
         self.param_tableWidget.setRowCount(len(res.parameter))
-        for j, pvalue in enumerate(res.parameter.values()):
-            name = pvalue.name
+        for j, (pkey, pvalue) in enumerate(res.parameter.items()):
+            name = pkey
             p_header = QtWidgets.QTableWidgetItem(convert(name, 'tex', 'str', brackets=True))
             self.param_tableWidget.setVerticalHeaderItem(j, p_header)
 

src/gui_qt/main/management.py

@@ -653,12 +653,10 @@ class UpperManagement(QtCore.QObject):
             else:
                 continue
 
-            for key, pvalue in data.parameter.items():
-                name = pvalue.full_name
-                fit_key = key + data.model_name
+            for fit_key, pvalue in data.parameter.items():
 
                 if fit_key not in fit_dict:
-                    fit_dict[fit_key] = [[], name]
+                    fit_dict[fit_key] = [[], fit_key]
 
                 err = 0 if pvalue.error is None else pvalue.error