From 5406da32a550cb1780e5f6f3554ef3fe9b24d429 Mon Sep 17 00:00:00 2001
From: zhangxuxutm <951937200@qq.com>
Date: Sun, 3 Sep 2023 19:37:19 +0800
Subject: [PATCH] 0903c

---
 UI/AreaSettingWidget.py |  4 ++++
 UI/DelAreaWidget.py     |  5 +++++
 UI/DeviceWidget.py      |  5 +++++
 UI/MainWindow.py        | 14 ++++++++------
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/UI/AreaSettingWidget.py b/UI/AreaSettingWidget.py
index 7438a75..2a2ffb3 100644
--- a/UI/AreaSettingWidget.py
+++ b/UI/AreaSettingWidget.py
@@ -27,6 +27,10 @@ class AreaSettingWidget(QDialog):
 
 
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        ok_button = button_box.button(QDialogButtonBox.Ok)
+        ok_button.setText("确定")  # 设置Ok按钮的文本
+        cancel_button = button_box.button(QDialogButtonBox.Cancel)
+        cancel_button.setText("取消")  # 设置Cancel按钮的文本
         button_box.accepted.connect(self.check_input)
         button_box.rejected.connect(self.reject)
 
diff --git a/UI/DelAreaWidget.py b/UI/DelAreaWidget.py
index d74d61d..89ee564 100644
--- a/UI/DelAreaWidget.py
+++ b/UI/DelAreaWidget.py
@@ -37,6 +37,11 @@ class DelAreaWidget(QDialog):
                     self.checkbox_data[checkbox] = [row, column]
 
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        ok_button = button_box.button(QDialogButtonBox.Ok)
+        ok_button.setText("确定")  # 设置Ok按钮的文本
+        cancel_button = button_box.button(QDialogButtonBox.Cancel)
+        cancel_button.setText("取消")  # 设置Cancel按钮的文本
+
         button_box.accepted.connect(self.getDelAreaRowAndColunm)
         button_box.rejected.connect(self.reject)
         vorlayout.addLayout(layout)
diff --git a/UI/DeviceWidget.py b/UI/DeviceWidget.py
index 78fb77a..4c7f506 100644
--- a/UI/DeviceWidget.py
+++ b/UI/DeviceWidget.py
@@ -38,6 +38,11 @@ class DeviceDialog(QDialog):
 
 
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        ok_button = button_box.button(QDialogButtonBox.Ok)
+        ok_button.setText("确定")  # 设置Ok按钮的文本
+        cancel_button = button_box.button(QDialogButtonBox.Cancel)
+        cancel_button.setText("取消")  # 设置Cancel按钮的文本
+
         button_box.accepted.connect(self.check_input)
         button_box.rejected.connect(self.reject)
 
diff --git a/UI/MainWindow.py b/UI/MainWindow.py
index 677b618..184acc6 100644
--- a/UI/MainWindow.py
+++ b/UI/MainWindow.py
@@ -116,8 +116,8 @@ class MainWindow(QMainWindow):
         widgetArea = QWidget()
         widgetArea.setLayout(areaLayout2)
 
-        newbtn = QPushButton('New')
-        delbth = QPushButton('删除')
+        newbtn = QPushButton('添加通道')
+        delbth = QPushButton('删除通道')
 
         self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
         self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
@@ -243,7 +243,7 @@ class MainWindow(QMainWindow):
             print(rowAndColumn)
             row = rowAndColumn[0]
             column = rowAndColumn[1]
-            print(row,column)
+            print(row, column)
             if column == 0:
                 for i in range(4):
                     widget = areaLayout.itemAtPosition(row, i).widget()
@@ -272,9 +272,11 @@ class MainWindow(QMainWindow):
 
 
     def startProtocol(self):
-        # self.area.getallAreaValue(self.sub_windows)
-        thread = MyThread(self.area)
-        thread.start()
+        if self.areaLabel:
+            print(1)
+        else:
+            print(2)
+            return
 
 
     def closeEvent(self, event):