From f6b7ebec07897571c885ee80a4b48ab984ace62c Mon Sep 17 00:00:00 2001 From: Dominik Demuth Date: Tue, 22 Oct 2024 18:54:44 +0200 Subject: [PATCH] selecting x value as label for point selection should work --- src/gui_qt/_py/ptstab.py | 203 ++++++++--------- src/gui_qt/data/point_select.py | 50 +++-- src/gui_qt/main/management.py | 25 ++- src/nmreval/data/points.py | 11 +- src/resources/_ui/ptstab.ui | 373 +++++++++++++++++--------------- 5 files changed, 357 insertions(+), 305 deletions(-) diff --git a/src/gui_qt/_py/ptstab.py b/src/gui_qt/_py/ptstab.py index cfd3dd4..47f2ab6 100644 --- a/src/gui_qt/_py/ptstab.py +++ b/src/gui_qt/_py/ptstab.py @@ -14,29 +14,19 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") - 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) + Form.resize(417, 746) + self.gridLayout = QtWidgets.QGridLayout(Form) + self.gridLayout.setObjectName("gridLayout") + self.label_2 = QtWidgets.QLabel(Form) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 0, 0, 1, 2) + self.peaktable = QtWidgets.QListWidget(Form) + self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed) + self.peaktable.setObjectName("peaktable") + self.gridLayout.addWidget(self.peaktable, 1, 0, 1, 2) + self.special_checkbox = QtWidgets.QCheckBox(Form) + self.special_checkbox.setObjectName("special_checkbox") + self.gridLayout.addWidget(self.special_checkbox, 3, 0, 1, 1) self.special_comboBox = QtWidgets.QComboBox(Form) self.special_comboBox.setEnabled(False) self.special_comboBox.setObjectName("special_comboBox") @@ -44,59 +34,29 @@ class Ui_Form(object): 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.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.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.gridLayout.addWidget(self.special_comboBox, 3, 1, 1, 1) + spacerItem = QtWidgets.QSpacerItem(20, 30, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + self.gridLayout.addItem(spacerItem, 4, 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.gridLayout.addWidget(self.label_3, 5, 0, 1, 1) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.left_limit = QtWidgets.QLineEdit(Form) + self.left_limit.setObjectName("left_limit") + self.horizontalLayout_2.addWidget(self.left_limit) + self.right_limit = QtWidgets.QLineEdit(Form) + self.right_limit.setObjectName("right_limit") + self.horizontalLayout_2.addWidget(self.right_limit) + self.limit_combobox = QtWidgets.QComboBox(Form) + self.limit_combobox.setObjectName("limit_combobox") + self.limit_combobox.addItem("") + self.limit_combobox.addItem("") + self.horizontalLayout_2.addWidget(self.limit_combobox) + self.gridLayout.addLayout(self.horizontalLayout_2, 5, 1, 1, 1) + self.label_5 = QtWidgets.QLabel(Form) + self.label_5.setObjectName("label_5") + self.gridLayout.addWidget(self.label_5, 6, 0, 1, 1) self.average_combobox = QtWidgets.QComboBox(Form) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -108,52 +68,93 @@ class Ui_Form(object): self.average_combobox.addItem("") self.average_combobox.addItem("") self.average_combobox.addItem("") - self.gridLayout_2.addWidget(self.average_combobox, 5, 1, 1, 1) - self.label.setBuddy(self.comboBox) + self.gridLayout.addWidget(self.average_combobox, 6, 1, 1, 1) + self.label_4 = QtWidgets.QLabel(Form) + self.label_4.setObjectName("label_4") + self.gridLayout.addWidget(self.label_4, 7, 0, 1, 1) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + 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.addLayout(self.horizontalLayout, 7, 1, 1, 1) + self.label = QtWidgets.QLabel(Form) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 8, 0, 1, 1) + self.group_box = QtWidgets.QComboBox(Form) + self.group_box.setObjectName("group_box") + self.group_box.addItem("") + self.group_box.addItem("") + self.gridLayout.addWidget(self.group_box, 8, 1, 1, 1) + spacerItem1 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + self.gridLayout.addItem(spacerItem1, 9, 0, 1, 1) + self.graph_checkbox = QtWidgets.QCheckBox(Form) + self.graph_checkbox.setChecked(True) + self.graph_checkbox.setObjectName("graph_checkbox") + self.gridLayout.addWidget(self.graph_checkbox, 10, 0, 1, 1) + self.graph_combobox = QtWidgets.QComboBox(Form) + self.graph_combobox.setEnabled(False) + self.graph_combobox.setObjectName("graph_combobox") + self.gridLayout.addWidget(self.graph_combobox, 10, 1, 1, 1) + spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem2, 12, 0, 1, 1) + self.okButton = QtWidgets.QPushButton(Form) + icon = QtGui.QIcon.fromTheme("dialog-ok") + self.okButton.setIcon(icon) + self.okButton.setObjectName("okButton") + self.gridLayout.addWidget(self.okButton, 11, 0, 1, 2) + self.deleteButton = QtWidgets.QPushButton(Form) + icon = QtGui.QIcon.fromTheme("dialog-cancel") + self.deleteButton.setIcon(icon) + self.deleteButton.setObjectName("deleteButton") + self.gridLayout.addWidget(self.deleteButton, 2, 0, 1, 2) + self.label_2.setBuddy(self.peaktable) self.label_5.setBuddy(self.average_combobox) self.label_4.setBuddy(self.xbutton) - self.label_2.setBuddy(self.peaktable) + self.label.setBuddy(self.group_box) 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.peaktable, self.limit_combobox) + Form.setTabOrder(self.limit_combobox, 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.ybutton, self.group_box) + Form.setTabOrder(self.group_box, 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.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.label_2.setText(_translate("Form", "Selected points and regions")) + 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.special_checkbox.setText(_translate("Form", "Use special 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.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.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.limit_combobox.setItemText(0, _translate("Form", "points")) + self.limit_combobox.setItemText(1, _translate("Form", "range")) + self.label_5.setText(_translate("Form", "Aggregation")) 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.label_4.setText(_translate("Form", "New set based on")) + self.xbutton.setText(_translate("Form", "x")) + self.ybutton.setText(_translate("Form", "y")) + self.label.setText(_translate("Form", "Group by")) + self.group_box.setItemText(0, _translate("Form", "\"Group\" value")) + self.group_box.setItemText(1, _translate("Form", "x value")) + self.graph_checkbox.setText(_translate("Form", "New graph?")) + self.okButton.setText(_translate("Form", "Apply")) + self.deleteButton.setText(_translate("Form", "Delete selection")) diff --git a/src/gui_qt/data/point_select.py b/src/gui_qt/data/point_select.py index 63da782..b3d9eb7 100644 --- a/src/gui_qt/data/point_select.py +++ b/src/gui_qt/data/point_select.py @@ -27,14 +27,18 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form): self._last_item = None self.connected_figure = '' + self._avg_modes = ['mean', 'sum', 'integral', 'std'] + self._special_values = ['max', 'absmax', 'min', 'absmin'] + self._group_modes = ['group', 'x'] + 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()) + self.left_limit.setValidator(QtGui.QDoubleValidator()) + self.right_limit.setValidator(QtGui.QDoubleValidator()) def keyPressEvent(self, e): if e.key() == QtCore.Qt.Key.Key_Delete: @@ -107,28 +111,21 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form): @QtCore.pyqtSlot() def apply(self) -> dict: ret_dic = { - 'avg_range': [self.left_pt.value(), self.right_pt.value()], - 'avg_mode': {0: 'mean', 1: 'sum', 2: 'integral', 3: 'std'}[self.average_combobox.currentIndex()], + 'avg_range': self.get_limits(), + 'avg_mode': self._avg_modes[self.average_combobox.currentIndex()], 'special': None, 'idx': None, 'xy': (self.xbutton.isChecked(), self.ybutton.isChecked()), + 'groupby': self._group_modes[self.group_box.currentIndex()], } - if self.groupBox_2.isChecked(): - ret_dic['special'] = { - 0: 'max', - 1: 'absmax', - 2: 'min', - 3: 'absmin' - }[self.special_comboBox.currentIndex()] + if self.special_checkbox.isChecked(): + ret_dic['special'] = self._special_values[self.special_comboBox.currentIndex()] if len(self.pts) != 0: ret_dic['idx'] = self.pts - if self.graph_checkbox.isChecked(): - gid = '' - else: - gid = self.graph_combobox.currentData() + gid = self.graph_combobox.currentData() if not self.graph_checkbox.isChecked() else '' self.points_selected.emit(ret_dic, gid) @@ -213,9 +210,20 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form): 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) + @QtCore.pyqtSlot(int, name='on_special_checkbox_stateChanged') + def changed_special(self, checked: int): + self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked) + + def get_limits(self) -> tuple[float, float, str]: + try: + left = float(self.left_limit.text()) + except ValueError: + left = 0. + + try: + right = float(self.right_limit.text()) + except ValueError: + right = 0. + + return left, right, self.limit_combobox.currentText() + diff --git a/src/gui_qt/main/management.py b/src/gui_qt/main/management.py index 31553e3..8c923ae 100644 --- a/src/gui_qt/main/management.py +++ b/src/gui_qt/main/management.py @@ -791,16 +791,27 @@ class UpperManagement(QtCore.QObject): _active = self.graphs[self.current_graph].active new_datasets = {} + groupby = params.pop('groupby') + for sid in _active: data_i = self.data[sid] - if data_i.group not in new_datasets: - new_datasets[data_i.group] = [], [] - new_x_axis, _temp = new_datasets[data_i.group] - pts = data_i.points(params) - if pts: - new_x_axis.append(data_i.value) - _temp.append(pts) + + if groupby == 'group': + if data_i.group not in new_datasets: + new_datasets[data_i.group] = [], [] + new_x_axis, _temp = new_datasets[data_i.group] + if pts: + new_x_axis.append(data_i.value) + _temp.append(pts) + + else: + for (_x, _y, _yerr) in pts: + if _x not in new_datasets: + new_datasets[_x] = [], [] + new_x_axis, _temp = new_datasets[_x] + new_x_axis.append(data_i.value) + _temp.append([[_x, _y, _yerr]]) key_list = [] for label, (new_x_axis, _temp) in new_datasets.items(): diff --git a/src/nmreval/data/points.py b/src/nmreval/data/points.py index 656c685..4f7ec6b 100644 --- a/src/nmreval/data/points.py +++ b/src/nmreval/data/points.py @@ -273,9 +273,14 @@ class Points: def length(self): return len(self._x) - def points(self, idx: list = None, special: str = None, - avg_range: tuple[int, int] = (0, 0), avg_mode: str = 'mean', - pts: list = None) -> list[tuple]: + def points( + self, + idx: list = None, + special: str = None, + avg_range: tuple[int, int] = (0, 0), + avg_mode: str = 'mean', + pts: list = None, + ) -> list[tuple]: """ Return (x, y) values at specified positions. diff --git a/src/resources/_ui/ptstab.ui b/src/resources/_ui/ptstab.ui index e89407c..16701cb 100644 --- a/src/resources/_ui/ptstab.ui +++ b/src/resources/_ui/ptstab.ui @@ -6,53 +6,42 @@ 0 0 - 498 + 417 746 Form - - - 9 - - - - - - - - - - - - - - points - - - - - range - - - - - + + + + + Selected points and regions + + + peaktable + + - - - - - "Group" value - - - - - x value - - + + + + Edit by entering new value: +Single number for points (e.g. 1e-6); +two numbers separated by space for regions (e.g. 1e-6 5e-6). +Changing between regions and points is NOT possible + + + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed + + + + + + + Use special value + @@ -85,76 +74,54 @@ - - - - New graph? + + + + Qt::Vertical - - true + + QSizePolicy::Preferred - - - - - - Group by + + + 20 + 30 + - - comboBox - - - - - - - false - - - - - - - Delete selection - - - - .. - - - - - - - Edit by entering new value: -Single number for points (e.g. 1e-6); -two numbers separated by space for regions (e.g. 1e-6 5e-6). -Changing between regions and points is NOT possible - - - QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed - - - - - - - Use special value - - - - - - - Apply - - - - .. - - + + + + Region around points + + + + + + + + + + + + + + + + points + + + + + range + + + + + + + Aggregation @@ -165,70 +132,6 @@ Changing between regions and points is NOT possible - - - - - x - - - - - - - y - - - true - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 40 - - - - - - - - Region around points - - - - - - - New set based on - - - xbutton - - - - - - - Selected points and regions - - - peaktable - - - - @@ -258,17 +161,141 @@ Changing between regions and points is NOT possible + + + + New set based on + + + xbutton + + + + + + + + + x + + + + + + + y + + + true + + + + + + + + + Group by + + + group_box + + + + + + + + "Group" value + + + + + x value + + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 20 + + + + + + + + New graph? + + + true + + + + + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + Apply + + + + .. + + + + + + + Delete selection + + + + .. + + + peaktable - checkBox - special_comboBox - comboBox_2 + limit_combobox average_combobox xbutton ybutton - comboBox + group_box graph_checkbox graph_combobox