diff --git a/func/Module_SA_label_v2.py b/func/Module_SA_label_v2.py index 7bbc6fd..147bbc0 100644 --- a/func/Module_SA_label_v2.py +++ b/func/Module_SA_label_v2.py @@ -541,7 +541,7 @@ class DataFrameModel(QAbstractTableModel): # 获取此行的remark remark = not self._dataframe[self._dataframe["Index"] == event_index]["remark"].values[0] score = self._dataframe[self._dataframe["Index"] == event_index]["score"].values[0] - if remark == "待讨论": + if str(remark).startswith("待讨论"): return QColor(0, 0, 255) elif score == 1: return QColor(0, 255, 0) @@ -951,7 +951,7 @@ class MainWindow_SA_label(QMainWindow): row = row_list[0] model_index = self.data_model_revised.index(row, 0) self.ui.tableView_label_revised.scrollTo(model_index, - self.ui.tableView_label_revised.ScrollHint.PositionAtCenter) + self.ui.tableView_label_revised.ScrollHint.EnsureVisible) # 显示事件信息 row_list = self.data_model_origin._showdata[ self.data_model_origin._showdata["Index"] == event_index].index.tolist() @@ -959,7 +959,7 @@ class MainWindow_SA_label(QMainWindow): row = row_list[0] model_index = self.data_model_origin.index(row, 0) - self.ui.tableView_label.scrollTo(model_index, self.ui.tableView_label.ScrollHint.PositionAtCenter) + self.ui.tableView_label.scrollTo(model_index, self.ui.tableView_label.ScrollHint.EnsureVisible) 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 b3d8dd1..37ba7f8 100644 --- a/ui/MainWindow/MainWindow_SA_label_v2.py +++ b/ui/MainWindow/MainWindow_SA_label_v2.py @@ -85,10 +85,6 @@ class Ui_MainWindow_SA_label(object): self.verticalLayout_2.addLayout(self.horizontalLayout) - self.verticalSpacer = QSpacerItem(20, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) - - self.verticalLayout_2.addItem(self.verticalSpacer) - self.groupBox = QGroupBox(self.groupBox_left) self.groupBox.setObjectName(u"groupBox") self.verticalLayout_5 = QVBoxLayout(self.groupBox) @@ -250,7 +246,7 @@ class Ui_MainWindow_SA_label(object): self.verticalLayout_2.addWidget(self.pushButton_reset_event) - self.verticalSpacer_3 = QSpacerItem(20, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) + self.verticalSpacer_3 = QSpacerItem(20, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Maximum) self.verticalLayout_2.addItem(self.verticalSpacer_3) @@ -279,13 +275,12 @@ class Ui_MainWindow_SA_label(object): self.verticalLayout_2.setStretch(0, 1) self.verticalLayout_2.setStretch(1, 1) - self.verticalLayout_2.setStretch(2, 1) - self.verticalLayout_2.setStretch(3, 4) - self.verticalLayout_2.setStretch(4, 15) + self.verticalLayout_2.setStretch(2, 4) + self.verticalLayout_2.setStretch(3, 15) + self.verticalLayout_2.setStretch(4, 1) self.verticalLayout_2.setStretch(5, 1) - self.verticalLayout_2.setStretch(6, 1) - self.verticalLayout_2.setStretch(7, 2) - self.verticalLayout_2.setStretch(8, 5) + self.verticalLayout_2.setStretch(6, 2) + self.verticalLayout_2.setStretch(7, 5) self.gridLayout.addWidget(self.groupBox_left, 0, 0, 1, 1) diff --git a/ui/MainWindow/MainWindow_SA_label_v2.ui b/ui/MainWindow/MainWindow_SA_label_v2.ui index 4d189ac..ec0c24e 100644 --- a/ui/MainWindow/MainWindow_SA_label_v2.ui +++ b/ui/MainWindow/MainWindow_SA_label_v2.ui @@ -42,7 +42,7 @@ 睡眠呼吸暂停事件标注 - + @@ -95,19 +95,6 @@ - - - - Qt::Vertical - - - - 20 - 20 - - - - @@ -404,7 +391,7 @@ Qt::Vertical - QSizePolicy::Expanding + QSizePolicy::Maximum