From edd4178e4e38c1ef4fb37f1df2b6b14355129b1e Mon Sep 17 00:00:00 2001 From: marques <20172333133@m.scnu.edu.cn> Date: Tue, 2 Sep 2025 15:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0SA=E6=89=93=E6=A0=87=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E8=A1=8C=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- func/Module_SA_label_v2.py | 8 +++++++- ui/MainWindow/MainWindow_SA_label_v2.py | 8 +++++--- ui/MainWindow/MainWindow_SA_label_v2.ui | 7 ++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/func/Module_SA_label_v2.py b/func/Module_SA_label_v2.py index 147bbc0..4be3d55 100644 --- a/func/Module_SA_label_v2.py +++ b/func/Module_SA_label_v2.py @@ -7,7 +7,7 @@ import pandas as pd from PySide6.QtCore import QCoreApplication, QAbstractTableModel, QModelIndex, Qt, QTimer from PySide6.QtGui import QAction, QFont, QColor, QCursor, QIntValidator from PySide6.QtWidgets import QMessageBox, QMainWindow, QApplication, QButtonGroup, QTableWidget, QTableWidgetItem, \ - QHeaderView, QPlainTextEdit + QHeaderView, QPlainTextEdit, QTableView from matplotlib import gridspec from matplotlib.backends.backend_qt import NavigationToolbar2QT from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg @@ -877,6 +877,10 @@ class MainWindow_SA_label(QMainWindow): self.header_mapping_revised) self.ui.tableView_label_revised.setModel(self.data_model_revised) + # 设置选中行为为整行选择 + self.ui.tableView_label.setSelectionBehavior(QTableView.SelectRows) + self.ui.tableView_label_revised.setSelectionBehavior(QTableView.SelectRows) + # 按比例设置列宽 self.set_tableview_column_width_by_ratio(self.ui.tableView_label, [1, 3, 3, 3]) self.set_tableview_column_width_by_ratio(self.ui.tableView_label_revised, [1, 3, 1, 2, 2]) @@ -952,6 +956,7 @@ class MainWindow_SA_label(QMainWindow): model_index = self.data_model_revised.index(row, 0) self.ui.tableView_label_revised.scrollTo(model_index, self.ui.tableView_label_revised.ScrollHint.EnsureVisible) + self.ui.tableView_label_revised.selectRow(row) # 显示事件信息 row_list = self.data_model_origin._showdata[ self.data_model_origin._showdata["Index"] == event_index].index.tolist() @@ -960,6 +965,7 @@ class MainWindow_SA_label(QMainWindow): model_index = self.data_model_origin.index(row, 0) self.ui.tableView_label.scrollTo(model_index, self.ui.tableView_label.ScrollHint.EnsureVisible) + self.ui.tableView_label.selectRow(row) self.show_event_info(event_index) self.__jump_to__event__(event_index, keep_xlim=keep_xlim) diff --git a/ui/MainWindow/MainWindow_SA_label_v2.py b/ui/MainWindow/MainWindow_SA_label_v2.py index 37ba7f8..8445eea 100644 --- a/ui/MainWindow/MainWindow_SA_label_v2.py +++ b/ui/MainWindow/MainWindow_SA_label_v2.py @@ -151,6 +151,7 @@ class Ui_MainWindow_SA_label(object): self.comboBox_window_signal_length.addItem("") self.comboBox_window_signal_length.addItem("") self.comboBox_window_signal_length.addItem("") + self.comboBox_window_signal_length.addItem("") self.comboBox_window_signal_length.setObjectName(u"comboBox_window_signal_length") sizePolicy1.setHeightForWidth(self.comboBox_window_signal_length.sizePolicy().hasHeightForWidth()) self.comboBox_window_signal_length.setSizePolicy(sizePolicy1) @@ -692,7 +693,7 @@ class Ui_MainWindow_SA_label(object): self.retranslateUi(MainWindow_SA_label) - self.comboBox_window_signal_length.setCurrentIndex(2) + self.comboBox_window_signal_length.setCurrentIndex(3) QMetaObject.connectSlotsByName(MainWindow_SA_label) @@ -715,8 +716,9 @@ class Ui_MainWindow_SA_label(object): self.comboBox_window_signal_length.setItemText(0, QCoreApplication.translate("MainWindow_SA_label", u"30", None)) self.comboBox_window_signal_length.setItemText(1, QCoreApplication.translate("MainWindow_SA_label", u"60", None)) self.comboBox_window_signal_length.setItemText(2, QCoreApplication.translate("MainWindow_SA_label", u"120", None)) - self.comboBox_window_signal_length.setItemText(3, QCoreApplication.translate("MainWindow_SA_label", u"300", None)) - self.comboBox_window_signal_length.setItemText(4, QCoreApplication.translate("MainWindow_SA_label", u"600", None)) + self.comboBox_window_signal_length.setItemText(3, QCoreApplication.translate("MainWindow_SA_label", u"180", None)) + self.comboBox_window_signal_length.setItemText(4, QCoreApplication.translate("MainWindow_SA_label", u"300", None)) + self.comboBox_window_signal_length.setItemText(5, QCoreApplication.translate("MainWindow_SA_label", u"600", None)) self.checkBox_auto_save.setText(QCoreApplication.translate("MainWindow_SA_label", u"\u4fee\u6539\u540e\u81ea\u52a8\u4fdd\u5b58", None)) self.groupBox_label.setTitle(QCoreApplication.translate("MainWindow_SA_label", u"\u6807\u7b7e\u8bb0\u5f55", None)) diff --git a/ui/MainWindow/MainWindow_SA_label_v2.ui b/ui/MainWindow/MainWindow_SA_label_v2.ui index ec0c24e..be2c1cc 100644 --- a/ui/MainWindow/MainWindow_SA_label_v2.ui +++ b/ui/MainWindow/MainWindow_SA_label_v2.ui @@ -197,7 +197,7 @@ true - 2 + 3 QComboBox::NoInsert @@ -217,6 +217,11 @@ 120 + + + 180 + + 300