From 8d1ccd22fa3a7f03b9d1249d08fc5ab0eac7b1db Mon Sep 17 00:00:00 2001 From: Dominik Demuth Date: Mon, 21 Oct 2024 19:52:23 +0200 Subject: [PATCH] change ptstab widgets --- src/gui_qt/_py/ptstab.py | 209 ++++++++------- src/gui_qt/data/point_select.py | 13 +- src/resources/_ui/ptstab.ui | 442 ++++++++++++++++---------------- 3 files changed, 351 insertions(+), 313 deletions(-) diff --git a/src/gui_qt/_py/ptstab.py b/src/gui_qt/_py/ptstab.py index 211722f..cfd3dd4 100644 --- a/src/gui_qt/_py/ptstab.py +++ b/src/gui_qt/_py/ptstab.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file './nmreval/src/resources/_ui/ptstab.ui' +# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/ptstab.ui' # # Created by: PyQt5 UI code generator 5.15.10 # @@ -14,29 +14,90 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") - Form.resize(316, 747) - self.verticalLayout = QtWidgets.QVBoxLayout(Form) - self.verticalLayout.setContentsMargins(3, 3, 3, 3) - self.verticalLayout.setObjectName("verticalLayout") + Form.resize(498, 746) + self.gridLayout_2 = QtWidgets.QGridLayout(Form) + self.gridLayout_2.setVerticalSpacing(9) + self.gridLayout_2.setObjectName("gridLayout_2") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.lineEdit_2 = QtWidgets.QLineEdit(Form) + self.lineEdit_2.setObjectName("lineEdit_2") + self.horizontalLayout_2.addWidget(self.lineEdit_2) + self.lineEdit = QtWidgets.QLineEdit(Form) + self.lineEdit.setObjectName("lineEdit") + self.horizontalLayout_2.addWidget(self.lineEdit) + self.comboBox_2 = QtWidgets.QComboBox(Form) + self.comboBox_2.setObjectName("comboBox_2") + self.comboBox_2.addItem("") + self.comboBox_2.addItem("") + self.horizontalLayout_2.addWidget(self.comboBox_2) + self.gridLayout_2.addLayout(self.horizontalLayout_2, 4, 1, 1, 1) + self.comboBox = QtWidgets.QComboBox(Form) + self.comboBox.setObjectName("comboBox") + self.comboBox.addItem("") + self.comboBox.addItem("") + self.gridLayout_2.addWidget(self.comboBox, 7, 1, 1, 1) + self.special_comboBox = QtWidgets.QComboBox(Form) + self.special_comboBox.setEnabled(False) + self.special_comboBox.setObjectName("special_comboBox") + self.special_comboBox.addItem("") + self.special_comboBox.addItem("") + self.special_comboBox.addItem("") + self.special_comboBox.addItem("") + self.gridLayout_2.addWidget(self.special_comboBox, 3, 1, 1, 1) + self.graph_checkbox = QtWidgets.QCheckBox(Form) + self.graph_checkbox.setChecked(True) + self.graph_checkbox.setObjectName("graph_checkbox") + self.gridLayout_2.addWidget(self.graph_checkbox, 8, 0, 1, 1) + self.label = QtWidgets.QLabel(Form) + self.label.setObjectName("label") + self.gridLayout_2.addWidget(self.label, 7, 0, 1, 1) + self.graph_combobox = QtWidgets.QComboBox(Form) + self.graph_combobox.setEnabled(False) + self.graph_combobox.setObjectName("graph_combobox") + self.gridLayout_2.addWidget(self.graph_combobox, 8, 1, 1, 1) + self.deleteButton = QtWidgets.QPushButton(Form) + icon = QtGui.QIcon.fromTheme("dialog-cancel") + self.deleteButton.setIcon(icon) + self.deleteButton.setObjectName("deleteButton") + self.gridLayout_2.addWidget(self.deleteButton, 2, 0, 1, 2) self.peaktable = QtWidgets.QListWidget(Form) self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed) self.peaktable.setObjectName("peaktable") - self.verticalLayout.addWidget(self.peaktable) - self.groupBox = QtWidgets.QGroupBox(Form) - self.groupBox.setObjectName("groupBox") - self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox) - self.horizontalLayout.setContentsMargins(3, 3, 3, 3) - self.horizontalLayout.setSpacing(3) + self.gridLayout_2.addWidget(self.peaktable, 1, 0, 1, 2) + self.checkBox = QtWidgets.QCheckBox(Form) + self.checkBox.setObjectName("checkBox") + self.gridLayout_2.addWidget(self.checkBox, 3, 0, 1, 1) + self.okButton = QtWidgets.QPushButton(Form) + icon = QtGui.QIcon.fromTheme("dialog-ok") + self.okButton.setIcon(icon) + self.okButton.setObjectName("okButton") + self.gridLayout_2.addWidget(self.okButton, 9, 0, 1, 2) + self.label_5 = QtWidgets.QLabel(Form) + self.label_5.setObjectName("label_5") + self.gridLayout_2.addWidget(self.label_5, 5, 0, 1, 1) + self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.left_pt = QtWidgets.QSpinBox(self.groupBox) - self.left_pt.setMaximum(999) - self.left_pt.setObjectName("left_pt") - self.horizontalLayout.addWidget(self.left_pt) - self.right_pt = QtWidgets.QSpinBox(self.groupBox) - self.right_pt.setMaximum(999) - self.right_pt.setObjectName("right_pt") - self.horizontalLayout.addWidget(self.right_pt) - self.average_combobox = QtWidgets.QComboBox(self.groupBox) + self.xbutton = QtWidgets.QCheckBox(Form) + self.xbutton.setObjectName("xbutton") + self.horizontalLayout.addWidget(self.xbutton) + self.ybutton = QtWidgets.QCheckBox(Form) + self.ybutton.setChecked(True) + self.ybutton.setObjectName("ybutton") + self.horizontalLayout.addWidget(self.ybutton) + self.gridLayout_2.addLayout(self.horizontalLayout, 6, 1, 1, 1) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_2.addItem(spacerItem, 10, 0, 1, 1) + self.label_3 = QtWidgets.QLabel(Form) + self.label_3.setObjectName("label_3") + self.gridLayout_2.addWidget(self.label_3, 4, 0, 1, 1) + self.label_4 = QtWidgets.QLabel(Form) + self.label_4.setObjectName("label_4") + self.gridLayout_2.addWidget(self.label_4, 6, 0, 1, 1) + self.label_2 = QtWidgets.QLabel(Form) + self.label_2.setObjectName("label_2") + self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 2) + self.average_combobox = QtWidgets.QComboBox(Form) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -47,90 +108,52 @@ class Ui_Form(object): self.average_combobox.addItem("") self.average_combobox.addItem("") self.average_combobox.addItem("") - self.horizontalLayout.addWidget(self.average_combobox) - self.verticalLayout.addWidget(self.groupBox) - self.groupBox_2 = QtWidgets.QGroupBox(Form) - self.groupBox_2.setCheckable(True) - self.groupBox_2.setChecked(False) - self.groupBox_2.setObjectName("groupBox_2") - self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.groupBox_2) - self.horizontalLayout_5.setContentsMargins(3, 3, 3, 3) - self.horizontalLayout_5.setSpacing(2) - self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.special_comboBox = QtWidgets.QComboBox(self.groupBox_2) - self.special_comboBox.setObjectName("special_comboBox") - self.special_comboBox.addItem("") - self.special_comboBox.addItem("") - self.special_comboBox.addItem("") - self.special_comboBox.addItem("") - self.horizontalLayout_5.addWidget(self.special_comboBox) - self.verticalLayout.addWidget(self.groupBox_2) - self.groupBox_3 = QtWidgets.QGroupBox(Form) - self.groupBox_3.setObjectName("groupBox_3") - self.gridLayout = QtWidgets.QGridLayout(self.groupBox_3) - self.gridLayout.setContentsMargins(3, 3, 3, 3) - self.gridLayout.setSpacing(3) - self.gridLayout.setObjectName("gridLayout") - self.xbutton = QtWidgets.QCheckBox(self.groupBox_3) - self.xbutton.setObjectName("xbutton") - self.gridLayout.addWidget(self.xbutton, 0, 0, 1, 1) - self.ybutton = QtWidgets.QCheckBox(self.groupBox_3) - self.ybutton.setChecked(True) - self.ybutton.setObjectName("ybutton") - self.gridLayout.addWidget(self.ybutton, 0, 1, 1, 1) - self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3) - self.graph_checkbox.setChecked(True) - self.graph_checkbox.setObjectName("graph_checkbox") - self.gridLayout.addWidget(self.graph_checkbox, 1, 0, 1, 1) - self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3) - self.graph_combobox.setEnabled(False) - self.graph_combobox.setObjectName("graph_combobox") - self.gridLayout.addWidget(self.graph_combobox, 1, 1, 1, 1) - self.verticalLayout.addWidget(self.groupBox_3) - self.horizontalLayout_2 = QtWidgets.QHBoxLayout() - self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1) - self.horizontalLayout_2.setSpacing(2) - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.okButton = QtWidgets.QPushButton(Form) - icon = QtGui.QIcon.fromTheme("dialog-ok") - self.okButton.setIcon(icon) - self.okButton.setObjectName("okButton") - self.horizontalLayout_2.addWidget(self.okButton) - self.deleteButton = QtWidgets.QPushButton(Form) - icon = QtGui.QIcon.fromTheme("dialog-cancel") - self.deleteButton.setIcon(icon) - self.deleteButton.setObjectName("deleteButton") - self.horizontalLayout_2.addWidget(self.deleteButton) - self.verticalLayout.addLayout(self.horizontalLayout_2) + self.gridLayout_2.addWidget(self.average_combobox, 5, 1, 1, 1) + self.label.setBuddy(self.comboBox) + self.label_5.setBuddy(self.average_combobox) + self.label_4.setBuddy(self.xbutton) + self.label_2.setBuddy(self.peaktable) self.retranslateUi(Form) QtCore.QMetaObject.connectSlotsByName(Form) + Form.setTabOrder(self.peaktable, self.checkBox) + Form.setTabOrder(self.checkBox, self.special_comboBox) + Form.setTabOrder(self.special_comboBox, self.comboBox_2) + Form.setTabOrder(self.comboBox_2, self.average_combobox) + Form.setTabOrder(self.average_combobox, self.xbutton) + Form.setTabOrder(self.xbutton, self.ybutton) + Form.setTabOrder(self.ybutton, self.comboBox) + Form.setTabOrder(self.comboBox, self.graph_checkbox) + Form.setTabOrder(self.graph_checkbox, self.graph_combobox) def retranslateUi(self, Form): _translate = QtCore.QCoreApplication.translate Form.setWindowTitle(_translate("Form", "Form")) - self.peaktable.setToolTip(_translate("Form", "Edit by entering new value: \n" -"Single number for points (e.g. 1e-6); \n" -"two numbers separated by space for regions (e.g. 1e-6 5e-6). \n" -"Changing between regions and points is NOT possible")) - self.groupBox.setTitle(_translate("Form", "Average (drop-down used for pts and regions)")) - self.left_pt.setSuffix(_translate("Form", " pts")) - self.left_pt.setPrefix(_translate("Form", "- ")) - self.right_pt.setSuffix(_translate("Form", " pts")) - self.right_pt.setPrefix(_translate("Form", "+ ")) - self.average_combobox.setItemText(0, _translate("Form", "Mean")) - self.average_combobox.setItemText(1, _translate("Form", "Sum")) - self.average_combobox.setItemText(2, _translate("Form", "Integral")) - self.average_combobox.setItemText(3, _translate("Form", "Std. deviation")) - self.groupBox_2.setTitle(_translate("Form", "Special value")) + self.comboBox_2.setItemText(0, _translate("Form", "points")) + self.comboBox_2.setItemText(1, _translate("Form", "range")) + self.comboBox.setItemText(0, _translate("Form", "\"Group\" value")) + self.comboBox.setItemText(1, _translate("Form", "x value")) self.special_comboBox.setToolTip(_translate("Form", "Automatic selection of respective points")) self.special_comboBox.setItemText(0, _translate("Form", "max(y)")) self.special_comboBox.setItemText(1, _translate("Form", "max(abs(y))")) self.special_comboBox.setItemText(2, _translate("Form", "min(y)")) self.special_comboBox.setItemText(3, _translate("Form", "min(abs(y))")) - self.groupBox_3.setTitle(_translate("Form", "Result")) + self.graph_checkbox.setText(_translate("Form", "New graph?")) + self.label.setText(_translate("Form", "Group by")) + self.deleteButton.setText(_translate("Form", "Delete selection")) + self.peaktable.setToolTip(_translate("Form", "Edit by entering new value: \n" +"Single number for points (e.g. 1e-6); \n" +"two numbers separated by space for regions (e.g. 1e-6 5e-6). \n" +"Changing between regions and points is NOT possible")) + self.checkBox.setText(_translate("Form", "Use special value")) + self.okButton.setText(_translate("Form", "Apply")) + self.label_5.setText(_translate("Form", "Aggregation")) self.xbutton.setText(_translate("Form", "x")) self.ybutton.setText(_translate("Form", "y")) - self.graph_checkbox.setText(_translate("Form", "New graph?")) - self.okButton.setText(_translate("Form", "Apply")) - self.deleteButton.setText(_translate("Form", "Delete selected")) + self.label_3.setText(_translate("Form", "Region around points")) + self.label_4.setText(_translate("Form", "New set based on")) + self.label_2.setText(_translate("Form", "Selected points and regions")) + self.average_combobox.setItemText(0, _translate("Form", "Mean")) + self.average_combobox.setItemText(1, _translate("Form", "Sum")) + self.average_combobox.setItemText(2, _translate("Form", "Integral")) + self.average_combobox.setItemText(3, _translate("Form", "Std. deviation")) diff --git a/src/gui_qt/data/point_select.py b/src/gui_qt/data/point_select.py index bd8002a..63da782 100644 --- a/src/gui_qt/data/point_select.py +++ b/src/gui_qt/data/point_select.py @@ -1,6 +1,6 @@ import re -from ..Qt import QtCore, QtWidgets +from ..Qt import QtCore, QtWidgets, QtGui from .._py.ptstab import Ui_Form from ..lib.pg_objects import LogInfiniteLine, RegionItem @@ -29,9 +29,13 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form): self.okButton.clicked.connect(self.apply) self.deleteButton.clicked.connect(self.remove_points) + self.peaktable.itemChanged.connect(self.editing_finished) self.peaktable.itemDoubleClicked.connect(self.editing_started) + self.lineEdit.setValidator(QtGui.QDoubleValidator()) + self.lineEdit_2.setValidator(QtGui.QDoubleValidator()) + def keyPressEvent(self, e): if e.key() == QtCore.Qt.Key.Key_Delete: self.remove_points() @@ -208,3 +212,10 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form): @QtCore.pyqtSlot(int, name='on_graph_checkbox_stateChanged') def changed_state(self, checked): self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked) + + @QtCore.pyqtSlot(int, name='on_comboBox_2_currentIndexChanged') + def change_limits(self, idx: int) -> None: + self.left_pt.setVisible(idx == 0) + self.right_pt.setVisible(idx == 0) + self.doubleSpinBox.setVisible(idx == 1) + self.doubleSpinBox_2.setVisible(idx == 1) diff --git a/src/resources/_ui/ptstab.ui b/src/resources/_ui/ptstab.ui index d7c31ef..e89407c 100644 --- a/src/resources/_ui/ptstab.ui +++ b/src/resources/_ui/ptstab.ui @@ -6,27 +6,124 @@ 0 0 - 316 - 747 + 498 + 746 Form - - - 3 + + + 9 - - 3 - - - 3 - - - 3 - - + + + + + + + + + + + + + points + + + + + range + + + + + + + + + + + "Group" value + + + + + x value + + + + + + + + false + + + Automatic selection of respective points + + + + max(y) + + + + + max(abs(y)) + + + + + min(y) + + + + + min(abs(y)) + + + + + + + + New graph? + + + true + + + + + + + Group by + + + comboBox + + + + + + + false + + + + + + + Delete selection + + + + .. + + + + Edit by entering new value: @@ -39,235 +136,142 @@ Changing between regions and points is NOT possible - - - - Average (drop-down used for pts and regions) + + + + Use special value - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - pts - - - - - - - 999 - - - - - - - pts - - - + - - - 999 - - - - - - - - 0 - 0 - - - - - Mean - - - - - Sum - - - - - Integral - - - - - Std. deviation - - - - - - - - - Special value + + + + Apply - - true + + + .. - - false - - - - 2 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - Automatic selection of respective points - - - - max(y) - - - - - max(abs(y)) - - - - - min(y) - - - - - min(abs(y)) - - - - - - - - - Result + + + + Aggregation + + + average_combobox - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - x - - - - - - - y - - - true - - - - - - - New graph? - - - true - - - - - - - false - - - - - - - - 2 - - - 0 - + + - + - Apply - - - - .. + x - + - Delete selected + y - - - .. + + true + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + Region around points + + + + + + + New set based on + + + xbutton + + + + + + + Selected points and regions + + + peaktable + + + + + + + + 0 + 0 + + + + + Mean + + + + + Sum + + + + + Integral + + + + + Std. deviation + + + + + + peaktable + checkBox + special_comboBox + comboBox_2 + average_combobox + xbutton + ybutton + comboBox + graph_checkbox + graph_combobox +