IPKM/nmreval
16
2
Fork 1
Code Issues 43 Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: display fit parameter for single set

Browse Source
This commit is contained in:
dominik
2022-03-29 09:16:02 +02:00
parent 02cbfbea8d
commit 4ad82cf5b2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nmreval/fit/parameter.py
View File

@@ -118,7 +118,7 @@ class Parameter:
return start + f'{self.value:} (fixed)' return start + f'{self.value:} (fixed)'
def __add__(self, other: Parameter | float) -> float: def __add__(self, other: Parameter | float) -> float:
if isinstance(other, float): if isinstance(other, (float, int)):
return self.value + other return self.value + other
elif isinstance(other, Parameter): elif isinstance(other, Parameter):
return self.value + other.value return self.value + other.value

4
nmreval/gui_qt/data/datawidget/datawidget.py
View File

@@ -1,4 +1,4 @@
from typing import List, Union from typing import List, Tuple, Union
from .properties import PropWidget from .properties import PropWidget
from ...Qt import QtWidgets, QtGui, QtCore from ...Qt import QtWidgets, QtGui, QtCore
@@ -77,7 +77,7 @@ class DataTree(QtWidgets.QTreeWidget):
break break
@QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem) @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem)
def data_change(self, item: QtWidgets.QTreeWidgetItem) -> tuple[set, set]: def data_change(self, item: QtWidgets.QTreeWidgetItem) -> Tuple[set, set]:
idd = item.data(0, QtCore.Qt.UserRole) idd = item.data(0, QtCore.Qt.UserRole)
is_selected = item.checkState(0) == QtCore.Qt.Checked is_selected = item.checkState(0) == QtCore.Qt.Checked
to_be_hidden = set() to_be_hidden = set()

2
nmreval/gui_qt/fit/fitwindow.py
View File

@@ -443,7 +443,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
self.set_parameter_iter(fit_id, [p.value for p in fit_parameter], self.models[fitted_model]) self.set_parameter_iter(fit_id, [p.value for p in fit_parameter], self.models[fitted_model])
mean_parameter = [reduce(add, p)/len(p) for p in zip(*glob_fit_parameter)] mean_parameter = [reduce(add, p, 0)/len(p) for p in zip(*glob_fit_parameter)]
self.set_parameter_iter(None, mean_parameter, self.models[fitted_model]) self.set_parameter_iter(None, mean_parameter, self.models[fitted_model])