From 1ee92f89ffa93d40cdd096445daf676d589f9a9f Mon Sep 17 00:00:00 2001
From: "ZHANGXUXU\\95193" <951937200@qq.com>
Date: Tue, 12 Mar 2024 15:19:20 +0800
Subject: [PATCH] =?UTF-8?q?0312=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Static/Area.qss          |  20 ++++++++++----------
 Static/Main.qss          |   3 ++-
 Static/force.png         | Bin 0 -> 294 bytes
 Static/startProtocol.png | Bin 0 -> 427 bytes
 UI/AreaTabWidget.py      |   6 +++---
 UI/MainWindow.py         |   4 +++-
 6 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 Static/force.png
 create mode 100644 Static/startProtocol.png

diff --git a/Static/Area.qss b/Static/Area.qss
index 8e7aadc..e32560e 100644
--- a/Static/Area.qss
+++ b/Static/Area.qss
@@ -23,15 +23,15 @@ QPushButton#wirteDIDOforceBtn {
 
 QPushButton#forceBtn {
 
-    font-size: 26px;
+    font-size: 25px;
 
-    padding-left: 5px;
+    padding-left: 10px;
 
-    padding-right: 5px;
+    padding-right: 10px;
 
-    padding-top: 5px;
+    /* padding-top: 5px;
 
-    padding-bottom: 5px;
+    padding-bottom: 5px; */
 
 }
 
@@ -56,7 +56,7 @@ QPushButton#initAddDeviceButton, QPushButton#initAreaAddButton{
 
 QPushButton#initAddDeviceButton:hover, QPushButton#initAreaAddButton:hover, QPushButton#deviceAddButton:hover, QPushButton#addareabutton:hover{
 
-    color: #1a86d8;
+    color: #0f8ef0;
 
     font: bold; 
 
@@ -68,13 +68,13 @@ QPushButton#initAddDeviceButton:hover, QPushButton#initAreaAddButton:hover, QPus
 
 
 
-QLabel#WirteDIDOareaMessLabel, QLabel#WirteDIDOareaValueLabel{
+QLabel#wirteDIDOareaMessLabel, QLabel#wirteDIDOareaValueLabel{
 
     font-size: 16px;
 
 }
 
-QLabel#WirteDIDOareaValueLabel{
+QLabel#wirteDIDOareaValueLabel, QLabel#readDIDOareaValueLabel{
 
     color: #0160aa;
 
@@ -121,7 +121,7 @@ QLabel#areaValueLabel{
 
 QLineEdit#byteLineEdit{
 
-    font-size: 24px;
+    font-size: 20px;
 
 }
 
@@ -135,7 +135,7 @@ QLineEdit#areaLineEdit {
 
 
 
-QLineEdit#WirteDIDOareaLineEdit {
+QLineEdit#wirteDIDOareaLineEdit {
 
     font-size: 16px;
 
diff --git a/Static/Main.qss b/Static/Main.qss
index 7e3b6e8..206281d 100644
--- a/Static/Main.qss
+++ b/Static/Main.qss
@@ -120,4 +120,5 @@ QToolBar QToolButton{
     font-size: 20px;
     font: bold; 
 
-}
\ No newline at end of file
+}
+
diff --git a/Static/force.png b/Static/force.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b4f85752ab01d7f9c98d9f48098a66c25a01554
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#;7LS5R5(wqlR*xGFc3v&2nQgXKoc?X7I+e636~HqL6_)B<Q6XK!V@5SNykjE
z2}q?i+EvqbUVs1mBK$aTSRaaO1*Bqyn6znByRgTAQW78@foKm1d6Pzk4Ke{J?3P@F
z<W~r^VBj3c2x!yIjUl0s2O!8<je_o^*N3WR0emnJmxTxZu7B24jTNA8>(wyCs}(#7
zt;QMfuBOS>y;q|)mXg>+(_1xw&E@$$i?&|@0wH6M;7kCuE_MR2iMpkxfH}62-Crf9
sP+5ayi}jzQ{OYys){jZFeH_#N6Qf<H5lu?|N&o-=07*qoM6N<$f>`c%`2YX_

literal 0
HcmV?d00001

diff --git a/Static/startProtocol.png b/Static/startProtocol.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7bb4a9afb55ca81c060929a59082ce5760f1a74
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Wl2OqR9HvlmOW0xKoEuBLqg&JBya|}1UUr-Rl0O^ICPYDfkaDBMV&qrIRa&B
z3fngTdC(v&0{`re9VH8jThH$M=IzYv5|KYf*2n(^IG)QzmwRQ(7pt>_9T+9DB+v?x
zXEg6?4y<S700j8X)&cDlpdu#D@^K=fp!)?7<p@p^xfbA|tJ1f61mhdI0`a8c0$d7_
z*FiRFLsv+KKAz<n9}RKdkVYF?0ECzqDYH$*b^YKuU=i<1MhmydIQg3ZI^itYSz_vw
zQSXlf!P4u1r3NhGKVw{5ngD#aTwh_$R@dmbc58zU^cC^N4=O^71LYA`xZ_6%)>luR
zU0|sJAr^=4n7-Y!3_*ncH|9X73kZw=oC8=1F)dQALn6Nay$8|ht(;XAp1&XjuR=6j
zaQ0fjdIRXDzaUyvwt5>nJ@+K5x7hx@h@!s<+X`)`H4qKJ(qfjFL2YQ+*cuZZ;1hKB
Vy&)*Btk(bl002ovPDHLkV1ngnvIGDC

literal 0
HcmV?d00001

diff --git a/UI/AreaTabWidget.py b/UI/AreaTabWidget.py
index 5105ff2..ae62441 100644
--- a/UI/AreaTabWidget.py
+++ b/UI/AreaTabWidget.py
@@ -145,14 +145,14 @@ class AreaWidget(QWidget):
 
         LimitData = self.devicesManange.getLimitData(self.areaTabWidget.deviceName)
 
-        self.pvUpperLimit = QLabel('量程上限: {}'.format(LimitData[0]))
+        self.pvUpperLimit = QLabel('量程上限:  {}'.format(LimitData[0]))
         self.pvUpperLimit.setObjectName('pvUpperLimit')
         
 
-        self.pvLowerLimit = QLabel('量程下限: {}'.format(LimitData[1]))
+        self.pvLowerLimit = QLabel('量程下限:  {}'.format(LimitData[1]))
         self.pvLowerLimit.setObjectName('pvLowerLimit')
 
-        self.pvUnit = QLabel('单位: {}'.format(LimitData[2]))
+        self.pvUnit = QLabel('单      位:  {}'.format(LimitData[2]))
         self.pvUnit.setObjectName('pvUnit')
        
         
diff --git a/UI/MainWindow.py b/UI/MainWindow.py
index 7c93f28..a85f3cb 100644
--- a/UI/MainWindow.py
+++ b/UI/MainWindow.py
@@ -32,8 +32,10 @@ class MainWindow(QMainWindow):
         self.toolbar = QToolBar()
         self.addToolBar(self.toolbar)
         
-        self.startProtocolBtn = QAction("开始通讯", self)
+        self.startProtocolBtn = QAction(self)
         self.startProtocolBtn.setObjectName("startProtocolBtn")
+        self.startProtocolBtn.setIcon(QIcon('Static/startProtocol.png'))
+        self.startProtocolBtn.setIconText('开始通讯')
         self.startProtocolBtn.setCheckable(True)
         self.startProtocolBtn.triggered.connect(self.startProtocol)