IPKM/nmreval
12
2
Fork 0
Code Issues 35 Pull Requests Actions Packages Projects 2 Wiki Activity

issue-168 (#183)
All checks were successful
Build AppImage / Explore-Gitea-Actions (push) Successful in 2m0s
Details

Browse Source 
fix FC reading problems; fixes #168

Co-authored-by: Dominik Demuth <dominik.demuth@physik.tu-darmstadt.de>
Reviewed-on: #183
This commit is contained in:
Dominik Demuth 2023-12-15 18:27:32 +00:00
parent af0e0fc76f
commit 036d798813
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_qt/io/fcbatchreader.py
View File

@ -22,6 +22,8 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
self.start_lineedit.setValidator(QtGui.QDoubleValidator()) self.start_lineedit.setValidator(QtGui.QDoubleValidator())
self.stop_lineedit.setValidator(QtGui.QDoubleValidator()) self.stop_lineedit.setValidator(QtGui.QDoubleValidator())
self.graph_checkbox.stateChanged.connect(lambda x: self.graph_comboBox.setEnabled(not bool(x)))
self.listWidget.installEventFilter(self) self.listWidget.installEventFilter(self)
def eventFilter(self, src: QtCore.QObject, evt: QtCore.QEvent) -> bool: def eventFilter(self, src: QtCore.QObject, evt: QtCore.QEvent) -> bool:
@ -107,7 +109,7 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
ret_vals.extend(fc_eval.get_parameter(path=self.label.text(), kind='temp', parameter=save_variables)) ret_vals.extend(fc_eval.get_parameter(path=self.label.text(), kind='temp', parameter=save_variables))
grp = '' grp = ''
if self.graph_checkbox.isChecked(): if not self.graph_checkbox.isChecked():
grp = self.graph_comboBox.currentData(QtCore.Qt.UserRole) grp = self.graph_comboBox.currentData(QtCore.Qt.UserRole)
self.data_read.emit(ret_vals, grp) self.data_read.emit(ret_vals, grp)

2
src/gui_qt/main/mainwindow.py
View File

@ -276,6 +276,8 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
reader.data_read.connect(self.management.add_new_data) reader.data_read.connect(self.management.add_new_data)
reader.exec() reader.exec()
self.path = reader.path
del reader del reader
@QtCore.pyqtSlot(name='on_actionPrint_triggered') @QtCore.pyqtSlot(name='on_actionPrint_triggered')

2
src/nmreval/io/fcbatchreader.py
View File

@ -48,7 +48,7 @@ class FCReader:
found_temperature = filename.stem found_temperature = filename.stem
if filename.is_file(): if filename.is_file():
if region is None: if (region is None) or (region == (None, None)):
_temp = self._read_from_hdf(filename) _temp = self._read_from_hdf(filename)
else: else:
_temp = self._read_signals(filename, region) _temp = self._read_signals(filename, region)