From 588a1ae4ed47f8ce777a65f9a7bd8834b6ba8c92 Mon Sep 17 00:00:00 2001
From: marques <20172333133@m.scnu.edu.cn>
Date: Tue, 2 Sep 2025 15:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96SA=E6=89=93=E6=A0=87=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=EF=BC=8C=E8=B0=83=E6=95=B4=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E9=97=B4=E8=B7=9D=E5=92=8C=E4=BC=B8=E7=BC=A9=E5=9B=A0?=
 =?UTF-8?q?=E5=AD=90=EF=BC=8C=E6=8F=90=E5=8D=87=E7=95=8C=E9=9D=A2=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 func/Module_SA_label_v2.py              |  6 +++---
 ui/MainWindow/MainWindow_SA_label_v2.py | 17 ++++++-----------
 ui/MainWindow/MainWindow_SA_label_v2.ui | 17 ++---------------
 3 files changed, 11 insertions(+), 29 deletions(-)

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 @@
       <property name="title">
        <string>睡眠呼吸暂停事件标注</string>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1,1,4,15,1,1,2,5">
+      <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1,4,15,1,1,2,5">
        <item>
         <widget class="QLabel" name="label_sampno">
          <property name="font">
@@ -95,19 +95,6 @@
          </item>
         </layout>
        </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
@@ -404,7 +391,7 @@
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
+          <enum>QSizePolicy::Maximum</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>