issue-168 (#183)
All checks were successful
Build AppImage / Explore-Gitea-Actions (push) Successful in 2m0s
All checks were successful
Build AppImage / Explore-Gitea-Actions (push) Successful in 2m0s
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:
parent
af0e0fc76f
commit
036d798813
@ -22,6 +22,8 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
|
||||
self.start_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)
|
||||
|
||||
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))
|
||||
|
||||
grp = ''
|
||||
if self.graph_checkbox.isChecked():
|
||||
if not self.graph_checkbox.isChecked():
|
||||
grp = self.graph_comboBox.currentData(QtCore.Qt.UserRole)
|
||||
|
||||
self.data_read.emit(ret_vals, grp)
|
||||
|
@ -276,6 +276,8 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
|
||||
reader.data_read.connect(self.management.add_new_data)
|
||||
reader.exec()
|
||||
|
||||
self.path = reader.path
|
||||
|
||||
del reader
|
||||
|
||||
@QtCore.pyqtSlot(name='on_actionPrint_triggered')
|
||||
|
@ -48,7 +48,7 @@ class FCReader:
|
||||
found_temperature = filename.stem
|
||||
|
||||
if filename.is_file():
|
||||
if region is None:
|
||||
if (region is None) or (region == (None, None)):
|
||||
_temp = self._read_from_hdf(filename)
|
||||
else:
|
||||
_temp = self._read_signals(filename, region)
|
||||
|
Loading…
Reference in New Issue
Block a user