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

209-fit-tree #222

Merged
dominik merged 2 commits from 209-fit-tree into master 2024-01-21 17:01:46 +00:00
Conversation 0 Commits 2 Files Changed 3 +8 -3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 625af5ec71 - Show all commits

2
src/gui_qt/fit/fit_forms.py
View File

@ -70,7 +70,7 @@ class FitModelTree(QtWidgets.QTreeWidget):
self.remove_function(item) self.remove_function(item)
elif evt.key() == QtCore.Qt.Key.Key_Space: elif evt.key() == QtCore.Qt.Key.Key_Space:
for item in self.treeWidget.selectedItems(): for item in self.selectedItems():
cs = item.checkState(0) cs = item.checkState(0)
if cs == QtCore.Qt.CheckState.Unchecked: if cs == QtCore.Qt.CheckState.Unchecked:
item.setCheckState(0, QtCore.Qt.CheckState.Checked) item.setCheckState(0, QtCore.Qt.CheckState.Checked)

5
src/nmreval/fit/_meta.py
View File

@ -26,6 +26,11 @@ class ModelFactory:
if func['children']: if func['children']:
right, _, _ = ModelFactory.create_from_list(func['children'], left_cnt=func['pos'], right, _, _ = ModelFactory.create_from_list(func['children'], left_cnt=func['pos'],
func_order=func_order, param_len=param_len) func_order=func_order, param_len=param_len)
if right is None:
right = func['func']
right_cnt = func['cnt']
else:
right_cnt = None right_cnt = None
right = MultiModel(func['func'], right, func['children'][0]['op'], left_idx=func['cnt'], right_idx=None) right = MultiModel(func['func'], right, func['children'][0]['op'], left_idx=func['cnt'], right_idx=None)
else: else: