diff --git a/src/gui_qt/_py/fcreader.py b/src/gui_qt/_py/fcreader.py index 766c641..041a46c 100644 --- a/src/gui_qt/_py/fcreader.py +++ b/src/gui_qt/_py/fcreader.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'resources/_ui/fcreader.ui' +# Form implementation generated from reading ui file 'src/resources/_ui/fcreader.ui' # -# Created by: PyQt5 UI code generator 5.12.3 +# Created by: PyQt5 UI code generator 5.15.10 # -# WARNING! All changes made in this file will be lost! +# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# run again. Do not edit this file unless you know what you are doing. from PyQt5 import QtCore, QtGui, QtWidgets @@ -47,6 +48,7 @@ class Ui_FCEval_dialog(object): self.verticalLayout.addWidget(self.input_box) self.region_box = QtWidgets.QGroupBox(FCEval_dialog) self.region_box.setCheckable(True) + self.region_box.setChecked(False) self.region_box.setObjectName("region_box") self.horizontalLayout = QtWidgets.QHBoxLayout(self.region_box) self.horizontalLayout.setContentsMargins(3, 3, 3, 3) @@ -139,6 +141,7 @@ class Ui_FCEval_dialog(object): self.line.setObjectName("line") self.gridLayout.addWidget(self.line, 2, 0, 1, 2) self.graph_comboBox = QtWidgets.QComboBox(self.out_box) + self.graph_comboBox.setEnabled(False) self.graph_comboBox.setObjectName("graph_comboBox") self.gridLayout.addWidget(self.graph_comboBox, 3, 1, 1, 1) self.graph_checkbox = QtWidgets.QCheckBox(self.out_box) @@ -167,8 +170,8 @@ class Ui_FCEval_dialog(object): self.label_6.setBuddy(self.m0_cb) self.retranslateUi(FCEval_dialog) - self.buttonBox.accepted.connect(FCEval_dialog.accept) - self.buttonBox.rejected.connect(FCEval_dialog.reject) + self.buttonBox.accepted.connect(FCEval_dialog.accept) # type: ignore + self.buttonBox.rejected.connect(FCEval_dialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(FCEval_dialog) def retranslateUi(self, FCEval_dialog): @@ -178,7 +181,7 @@ class Ui_FCEval_dialog(object): self.file_pushbutton.setText(_translate("FCEval_dialog", "Add HDF files...")) self.dir_pushbutton.setText(_translate("FCEval_dialog", "Add directory...")) self.overwrite_cb.setText(_translate("FCEval_dialog", "Overwrite prev. data")) - self.region_box.setTitle(_translate("FCEval_dialog", "Evaluate region (empty values default to start/end)")) + self.region_box.setTitle(_translate("FCEval_dialog", "Evaluate region (empty values default to values of the script)")) self.start_lineedit.setPlaceholderText(_translate("FCEval_dialog", "start pos in µs")) self.stop_lineedit.setPlaceholderText(_translate("FCEval_dialog", "end pos in µs")) self.fit_box.setTitle(_translate("FCEval_dialog", "Fit equation")) diff --git a/src/gui_qt/io/fcbatchreader.py b/src/gui_qt/io/fcbatchreader.py index 664394c..c4bb80b 100644 --- a/src/gui_qt/io/fcbatchreader.py +++ b/src/gui_qt/io/fcbatchreader.py @@ -22,7 +22,9 @@ 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.graph_checkbox.stateChanged.connect( + lambda x: self.graph_comboBox.setEnabled(x == QtCore.Qt.CheckState.Unchecked) + ) self.listWidget.installEventFilter(self) diff --git a/src/resources/_ui/fcreader.ui b/src/resources/_ui/fcreader.ui index 7c818de..ff4695c 100644 --- a/src/resources/_ui/fcreader.ui +++ b/src/resources/_ui/fcreader.ui @@ -96,11 +96,14 @@ - Evaluate region (empty values default to start/end) + Evaluate region (empty values default to values of the script) true + + false + 3 @@ -311,7 +314,11 @@ - + + + false + +