From 989919a73c5ebd46368991b6c3ff6959e32490b6 Mon Sep 17 00:00:00 2001
From: tao_z <tzj0429@163.com>
Date: Tue, 23 Aug 2022 22:06:32 +0800
Subject: [PATCH] 完善did读取显示

---
 .qt_for_python/uic/main.py |  382 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 320 insertions(+), 62 deletions(-)

diff --git a/.qt_for_python/uic/main.py b/.qt_for_python/uic/main.py
index 8f04f45..846f6cc 100644
--- a/.qt_for_python/uic/main.py
+++ b/.qt_for_python/uic/main.py
@@ -17,8 +17,8 @@
     def setupUi(self, MainWindow):
         if not MainWindow.objectName():
             MainWindow.setObjectName(u"MainWindow")
-        MainWindow.resize(1050, 800)
-        MainWindow.setMinimumSize(QSize(1050, 800))
+        MainWindow.resize(1050, 650)
+        MainWindow.setMinimumSize(QSize(1050, 650))
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
@@ -26,7 +26,7 @@
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth())
         self.centralwidget.setSizePolicy(sizePolicy)
-        self.centralwidget.setMinimumSize(QSize(1050, 800))
+        self.centralwidget.setMinimumSize(QSize(1050, 650))
         self.verticalLayout = QVBoxLayout(self.centralwidget)
         self.verticalLayout.setObjectName(u"verticalLayout")
         self.verticalLayout_5 = QVBoxLayout()
@@ -475,6 +475,18 @@
 
         self.horizontalLayout_5.addWidget(self.SessionContrl_gbx_4)
 
+        self.SessionContrl_gbx_6 = QGroupBox(self.tab)
+        self.SessionContrl_gbx_6.setObjectName(u"SessionContrl_gbx_6")
+        self.verticalLayout_19 = QVBoxLayout(self.SessionContrl_gbx_6)
+        self.verticalLayout_19.setObjectName(u"verticalLayout_19")
+        self.comboBox_13 = QComboBox(self.SessionContrl_gbx_6)
+        self.comboBox_13.setObjectName(u"comboBox_13")
+
+        self.verticalLayout_19.addWidget(self.comboBox_13)
+
+
+        self.horizontalLayout_5.addWidget(self.SessionContrl_gbx_6)
+
         self.SessionContrl_gbx_2 = QGroupBox(self.tab)
         self.SessionContrl_gbx_2.setObjectName(u"SessionContrl_gbx_2")
         self.verticalLayout_8 = QVBoxLayout(self.SessionContrl_gbx_2)
@@ -511,12 +523,53 @@
         self.horizontalLayout_5.setStretch(2, 1)
         self.horizontalLayout_5.setStretch(3, 1)
         self.horizontalLayout_5.setStretch(4, 1)
+        self.horizontalLayout_5.setStretch(5, 1)
 
         self.verticalLayout_9.addLayout(self.horizontalLayout_5)
+
+        self.horizontalLayout_22 = QHBoxLayout()
+        self.horizontalLayout_22.setSpacing(6)
+        self.horizontalLayout_22.setObjectName(u"horizontalLayout_22")
+        self.groupBox_9 = QGroupBox(self.tab)
+        self.groupBox_9.setObjectName(u"groupBox_9")
+        self.horizontalLayout_23 = QHBoxLayout(self.groupBox_9)
+        self.horizontalLayout_23.setObjectName(u"horizontalLayout_23")
+        self.comboBox_11 = QComboBox(self.groupBox_9)
+        self.comboBox_11.setObjectName(u"comboBox_11")
+
+        self.horizontalLayout_23.addWidget(self.comboBox_11)
+
+
+        self.horizontalLayout_22.addWidget(self.groupBox_9)
+
+        self.groupBox_10 = QGroupBox(self.tab)
+        self.groupBox_10.setObjectName(u"groupBox_10")
+        self.horizontalLayout_24 = QHBoxLayout(self.groupBox_10)
+        self.horizontalLayout_24.setObjectName(u"horizontalLayout_24")
+        self.comboBox_12 = QComboBox(self.groupBox_10)
+        self.comboBox_12.setObjectName(u"comboBox_12")
+
+        self.horizontalLayout_24.addWidget(self.comboBox_12)
+
+
+        self.horizontalLayout_22.addWidget(self.groupBox_10)
+
+        self.groupBox_11 = QGroupBox(self.tab)
+        self.groupBox_11.setObjectName(u"groupBox_11")
+        self.horizontalLayout_25 = QHBoxLayout(self.groupBox_11)
+        self.horizontalLayout_25.setObjectName(u"horizontalLayout_25")
+        self.pushButton_49 = QPushButton(self.groupBox_11)
+        self.pushButton_49.setObjectName(u"pushButton_49")
+
+        self.horizontalLayout_25.addWidget(self.pushButton_49)
+
+
+        self.horizontalLayout_22.addWidget(self.groupBox_11)
 
         self.groupBox_3 = QGroupBox(self.tab)
         self.groupBox_3.setObjectName(u"groupBox_3")
         self.horizontalLayout_10 = QHBoxLayout(self.groupBox_3)
+        self.horizontalLayout_10.setSpacing(6)
         self.horizontalLayout_10.setObjectName(u"horizontalLayout_10")
         self.pushButton_31 = QPushButton(self.groupBox_3)
         self.pushButton_31.setObjectName(u"pushButton_31")
@@ -528,71 +581,272 @@
 
         self.horizontalLayout_10.addWidget(self.pushButton_32)
 
+        self.horizontalLayout_10.setStretch(0, 1)
+        self.horizontalLayout_10.setStretch(1, 1)
 
-        self.verticalLayout_9.addWidget(self.groupBox_3)
+        self.horizontalLayout_22.addWidget(self.groupBox_3)
 
-        self.verticalLayout_9.setStretch(0, 6)
+        self.horizontalLayout_22.setStretch(0, 1)
+        self.horizontalLayout_22.setStretch(1, 1)
+        self.horizontalLayout_22.setStretch(2, 1)
+        self.horizontalLayout_22.setStretch(3, 2)
+
+        self.verticalLayout_9.addLayout(self.horizontalLayout_22)
+
+        self.verticalLayout_9.setStretch(0, 5)
         self.verticalLayout_9.setStretch(1, 1)
         self.verticalLayout_9.setStretch(2, 1)
         self.tabWidget.addTab(self.tab, "")
         self.tab_2 = QWidget()
         self.tab_2.setObjectName(u"tab_2")
-        self.verticalLayout_10 = QVBoxLayout(self.tab_2)
-        self.verticalLayout_10.setObjectName(u"verticalLayout_10")
+        self.horizontalLayout_28 = QHBoxLayout(self.tab_2)
+        self.horizontalLayout_28.setObjectName(u"horizontalLayout_28")
+        self.horizontalLayout_27 = QHBoxLayout()
+        self.horizontalLayout_27.setSpacing(20)
+        self.horizontalLayout_27.setObjectName(u"horizontalLayout_27")
+        self.horizontalLayout_27.setContentsMargins(-1, -1, 0, -1)
+        self.gridLayout_5 = QGridLayout()
+        self.gridLayout_5.setObjectName(u"gridLayout_5")
+        self.gridLayout_5.setContentsMargins(-1, -1, 0, -1)
+        self.pushButton_56 = QPushButton(self.tab_2)
+        self.pushButton_56.setObjectName(u"pushButton_56")
+        sizePolicy3.setHeightForWidth(self.pushButton_56.sizePolicy().hasHeightForWidth())
+        self.pushButton_56.setSizePolicy(sizePolicy3)
+        self.pushButton_56.setMinimumSize(QSize(30, 30))
+        self.pushButton_56.setMaximumSize(QSize(30, 30))
+        self.pushButton_56.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_56, 0, 1, 1, 1)
+
+        self.pushButton_54 = QPushButton(self.tab_2)
+        self.pushButton_54.setObjectName(u"pushButton_54")
+        sizePolicy3.setHeightForWidth(self.pushButton_54.sizePolicy().hasHeightForWidth())
+        self.pushButton_54.setSizePolicy(sizePolicy3)
+        self.pushButton_54.setMinimumSize(QSize(30, 30))
+        self.pushButton_54.setMaximumSize(QSize(30, 30))
+        self.pushButton_54.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_54, 1, 0, 1, 1)
+
+        self.pushButton_58 = QPushButton(self.tab_2)
+        self.pushButton_58.setObjectName(u"pushButton_58")
+        sizePolicy3.setHeightForWidth(self.pushButton_58.sizePolicy().hasHeightForWidth())
+        self.pushButton_58.setSizePolicy(sizePolicy3)
+        self.pushButton_58.setMinimumSize(QSize(30, 30))
+        self.pushButton_58.setMaximumSize(QSize(30, 30))
+        self.pushButton_58.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_58, 1, 1, 1, 1)
+
+        self.pushButton_62 = QPushButton(self.tab_2)
+        self.pushButton_62.setObjectName(u"pushButton_62")
+        sizePolicy3.setHeightForWidth(self.pushButton_62.sizePolicy().hasHeightForWidth())
+        self.pushButton_62.setSizePolicy(sizePolicy3)
+        self.pushButton_62.setMinimumSize(QSize(30, 30))
+        self.pushButton_62.setMaximumSize(QSize(30, 30))
+        self.pushButton_62.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_62, 2, 0, 1, 1)
+
+        self.pushButton_59 = QPushButton(self.tab_2)
+        self.pushButton_59.setObjectName(u"pushButton_59")
+        sizePolicy3.setHeightForWidth(self.pushButton_59.sizePolicy().hasHeightForWidth())
+        self.pushButton_59.setSizePolicy(sizePolicy3)
+        self.pushButton_59.setMinimumSize(QSize(30, 30))
+        self.pushButton_59.setMaximumSize(QSize(30, 30))
+        self.pushButton_59.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_59, 2, 1, 1, 1)
+
+        self.pushButton_61 = QPushButton(self.tab_2)
+        self.pushButton_61.setObjectName(u"pushButton_61")
+        sizePolicy3.setHeightForWidth(self.pushButton_61.sizePolicy().hasHeightForWidth())
+        self.pushButton_61.setSizePolicy(sizePolicy3)
+        self.pushButton_61.setMinimumSize(QSize(30, 30))
+        self.pushButton_61.setMaximumSize(QSize(30, 30))
+        self.pushButton_61.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_61, 3, 0, 1, 1)
+
+        self.pushButton_60 = QPushButton(self.tab_2)
+        self.pushButton_60.setObjectName(u"pushButton_60")
+        sizePolicy3.setHeightForWidth(self.pushButton_60.sizePolicy().hasHeightForWidth())
+        self.pushButton_60.setSizePolicy(sizePolicy3)
+        self.pushButton_60.setMinimumSize(QSize(30, 30))
+        self.pushButton_60.setMaximumSize(QSize(30, 30))
+        self.pushButton_60.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_60, 3, 1, 1, 1)
+
+        self.pushButton_57 = QPushButton(self.tab_2)
+        self.pushButton_57.setObjectName(u"pushButton_57")
+        sizePolicy3.setHeightForWidth(self.pushButton_57.sizePolicy().hasHeightForWidth())
+        self.pushButton_57.setSizePolicy(sizePolicy3)
+        self.pushButton_57.setMinimumSize(QSize(30, 30))
+        self.pushButton_57.setMaximumSize(QSize(30, 30))
+        self.pushButton_57.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
+"color: rgb(255,255,255);  \n"
+"border-radius: 15px; \n"
+"font: 9pt \"AcadEref\";\n"
+"border-style: outset;\n"
+"")
+
+        self.gridLayout_5.addWidget(self.pushButton_57, 4, 1, 1, 1)
+
+        self.gridLayout_5.setRowStretch(0, 1)
+        self.gridLayout_5.setRowStretch(1, 1)
+        self.gridLayout_5.setRowStretch(2, 1)
+        self.gridLayout_5.setRowStretch(3, 1)
+        self.gridLayout_5.setRowStretch(4, 1)
+        self.gridLayout_5.setColumnStretch(0, 1)
+        self.gridLayout_5.setColumnStretch(1, 1)
+        self.gridLayout_5.setColumnMinimumWidth(0, 1)
+        self.gridLayout_5.setColumnMinimumWidth(1, 1)
+        self.gridLayout_5.setRowMinimumHeight(0, 1)
+        self.gridLayout_5.setRowMinimumHeight(1, 1)
+        self.gridLayout_5.setRowMinimumHeight(2, 1)
+        self.gridLayout_5.setRowMinimumHeight(3, 1)
+        self.gridLayout_5.setRowMinimumHeight(4, 1)
+
+        self.horizontalLayout_27.addLayout(self.gridLayout_5)
+
         self.verticalLayout_11 = QVBoxLayout()
         self.verticalLayout_11.setObjectName(u"verticalLayout_11")
         self.pushButton_9 = QPushButton(self.tab_2)
         self.pushButton_9.setObjectName(u"pushButton_9")
+        sizePolicy4 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)
+        sizePolicy4.setHorizontalStretch(0)
+        sizePolicy4.setVerticalStretch(0)
+        sizePolicy4.setHeightForWidth(self.pushButton_9.sizePolicy().hasHeightForWidth())
+        self.pushButton_9.setSizePolicy(sizePolicy4)
+        self.pushButton_9.setMinimumSize(QSize(0, 31))
+        self.pushButton_9.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_9)
 
         self.pushButton_11 = QPushButton(self.tab_2)
         self.pushButton_11.setObjectName(u"pushButton_11")
+        sizePolicy4.setHeightForWidth(self.pushButton_11.sizePolicy().hasHeightForWidth())
+        self.pushButton_11.setSizePolicy(sizePolicy4)
+        self.pushButton_11.setMinimumSize(QSize(0, 31))
+        self.pushButton_11.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_11)
 
         self.pushButton_13 = QPushButton(self.tab_2)
         self.pushButton_13.setObjectName(u"pushButton_13")
+        sizePolicy4.setHeightForWidth(self.pushButton_13.sizePolicy().hasHeightForWidth())
+        self.pushButton_13.setSizePolicy(sizePolicy4)
+        self.pushButton_13.setMinimumSize(QSize(0, 31))
+        self.pushButton_13.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_13)
 
         self.pushButton_18 = QPushButton(self.tab_2)
         self.pushButton_18.setObjectName(u"pushButton_18")
+        sizePolicy4.setHeightForWidth(self.pushButton_18.sizePolicy().hasHeightForWidth())
+        self.pushButton_18.setSizePolicy(sizePolicy4)
+        self.pushButton_18.setMinimumSize(QSize(0, 31))
+        self.pushButton_18.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_18)
 
         self.pushButton_22 = QPushButton(self.tab_2)
         self.pushButton_22.setObjectName(u"pushButton_22")
+        sizePolicy4.setHeightForWidth(self.pushButton_22.sizePolicy().hasHeightForWidth())
+        self.pushButton_22.setSizePolicy(sizePolicy4)
+        self.pushButton_22.setMinimumSize(QSize(0, 31))
+        self.pushButton_22.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_22)
 
         self.pushButton_24 = QPushButton(self.tab_2)
         self.pushButton_24.setObjectName(u"pushButton_24")
+        sizePolicy4.setHeightForWidth(self.pushButton_24.sizePolicy().hasHeightForWidth())
+        self.pushButton_24.setSizePolicy(sizePolicy4)
+        self.pushButton_24.setMinimumSize(QSize(0, 31))
+        self.pushButton_24.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_24)
 
         self.pushButton_26 = QPushButton(self.tab_2)
         self.pushButton_26.setObjectName(u"pushButton_26")
+        sizePolicy4.setHeightForWidth(self.pushButton_26.sizePolicy().hasHeightForWidth())
+        self.pushButton_26.setSizePolicy(sizePolicy4)
+        self.pushButton_26.setMinimumSize(QSize(0, 31))
+        self.pushButton_26.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_26)
 
         self.pushButton_27 = QPushButton(self.tab_2)
         self.pushButton_27.setObjectName(u"pushButton_27")
+        sizePolicy4.setHeightForWidth(self.pushButton_27.sizePolicy().hasHeightForWidth())
+        self.pushButton_27.setSizePolicy(sizePolicy4)
+        self.pushButton_27.setMinimumSize(QSize(0, 31))
+        self.pushButton_27.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_27)
 
         self.pushButton_28 = QPushButton(self.tab_2)
         self.pushButton_28.setObjectName(u"pushButton_28")
+        sizePolicy4.setHeightForWidth(self.pushButton_28.sizePolicy().hasHeightForWidth())
+        self.pushButton_28.setSizePolicy(sizePolicy4)
+        self.pushButton_28.setMinimumSize(QSize(0, 31))
+        self.pushButton_28.setMaximumSize(QSize(500, 16777215))
 
         self.verticalLayout_11.addWidget(self.pushButton_28)
 
         self.pushButton_29 = QPushButton(self.tab_2)
         self.pushButton_29.setObjectName(u"pushButton_29")
+        sizePolicy4.setHeightForWidth(self.pushButton_29.sizePolicy().hasHeightForWidth())
+        self.pushButton_29.setSizePolicy(sizePolicy4)
+        self.pushButton_29.setMinimumSize(QSize(0, 31))
+        self.pushButton_29.setMaximumSize(QSize(500, 100))
 
         self.verticalLayout_11.addWidget(self.pushButton_29)
 
 
-        self.verticalLayout_10.addLayout(self.verticalLayout_11)
+        self.horizontalLayout_27.addLayout(self.verticalLayout_11)
+
+        self.horizontalLayout_27.setStretch(0, 1)
+        self.horizontalLayout_27.setStretch(1, 1)
+
+        self.horizontalLayout_28.addLayout(self.horizontalLayout_27)
 
         self.tabWidget.addTab(self.tab_2, "")
         self.tab_3 = QWidget()
@@ -605,138 +859,131 @@
         self.groupBox_6.setObjectName(u"groupBox_6")
         self.horizontalLayout_8 = QHBoxLayout(self.groupBox_6)
         self.horizontalLayout_8.setObjectName(u"horizontalLayout_8")
-        self.verticalLayout_13 = QVBoxLayout()
-        self.verticalLayout_13.setObjectName(u"verticalLayout_13")
+        self.gridLayout_3 = QGridLayout()
+        self.gridLayout_3.setObjectName(u"gridLayout_3")
         self.pushButton_35 = QPushButton(self.groupBox_6)
         self.pushButton_35.setObjectName(u"pushButton_35")
         sizePolicy3.setHeightForWidth(self.pushButton_35.sizePolicy().hasHeightForWidth())
         self.pushButton_35.setSizePolicy(sizePolicy3)
-        self.pushButton_35.setMinimumSize(QSize(60, 60))
-        self.pushButton_35.setMaximumSize(QSize(60, 60))
+        self.pushButton_35.setMinimumSize(QSize(30, 30))
+        self.pushButton_35.setMaximumSize(QSize(30, 3))
         self.pushButton_35.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_13.addWidget(self.pushButton_35)
+        self.gridLayout_3.addWidget(self.pushButton_35, 0, 0, 1, 1)
 
         self.pushButton_39 = QPushButton(self.groupBox_6)
         self.pushButton_39.setObjectName(u"pushButton_39")
         sizePolicy3.setHeightForWidth(self.pushButton_39.sizePolicy().hasHeightForWidth())
         self.pushButton_39.setSizePolicy(sizePolicy3)
-        self.pushButton_39.setMinimumSize(QSize(60, 60))
-        self.pushButton_39.setMaximumSize(QSize(60, 60))
+        self.pushButton_39.setMinimumSize(QSize(30, 30))
+        self.pushButton_39.setMaximumSize(QSize(30, 30))
         self.pushButton_39.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_13.addWidget(self.pushButton_39)
+        self.gridLayout_3.addWidget(self.pushButton_39, 1, 0, 1, 1)
 
         self.pushButton_36 = QPushButton(self.groupBox_6)
         self.pushButton_36.setObjectName(u"pushButton_36")
         sizePolicy3.setHeightForWidth(self.pushButton_36.sizePolicy().hasHeightForWidth())
         self.pushButton_36.setSizePolicy(sizePolicy3)
-        self.pushButton_36.setMinimumSize(QSize(60, 60))
-        self.pushButton_36.setMaximumSize(QSize(60, 60))
+        self.pushButton_36.setMinimumSize(QSize(30, 30))
+        self.pushButton_36.setMaximumSize(QSize(30, 30))
         self.pushButton_36.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_13.addWidget(self.pushButton_36)
+        self.gridLayout_3.addWidget(self.pushButton_36, 2, 0, 1, 1)
 
-        self.verticalLayout_13.setStretch(0, 2)
-        self.verticalLayout_13.setStretch(1, 2)
-        self.verticalLayout_13.setStretch(2, 2)
 
-        self.horizontalLayout_8.addLayout(self.verticalLayout_13)
+        self.horizontalLayout_8.addLayout(self.gridLayout_3)
 
-        self.verticalLayout_12 = QVBoxLayout()
-        self.verticalLayout_12.setObjectName(u"verticalLayout_12")
+        self.gridLayout_2 = QGridLayout()
+        self.gridLayout_2.setObjectName(u"gridLayout_2")
+        self.gridLayout_2.setContentsMargins(0, -1, -1, -1)
         self.pushButton_37 = QPushButton(self.groupBox_6)
         self.pushButton_37.setObjectName(u"pushButton_37")
         sizePolicy3.setHeightForWidth(self.pushButton_37.sizePolicy().hasHeightForWidth())
         self.pushButton_37.setSizePolicy(sizePolicy3)
-        self.pushButton_37.setMinimumSize(QSize(60, 60))
-        self.pushButton_37.setMaximumSize(QSize(60, 60))
+        self.pushButton_37.setMinimumSize(QSize(30, 30))
+        self.pushButton_37.setMaximumSize(QSize(30, 30))
         self.pushButton_37.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;\n"
 "")
 
-        self.verticalLayout_12.addWidget(self.pushButton_37)
+        self.gridLayout_2.addWidget(self.pushButton_37, 0, 0, 1, 1)
 
         self.pushButton_38 = QPushButton(self.groupBox_6)
         self.pushButton_38.setObjectName(u"pushButton_38")
         sizePolicy3.setHeightForWidth(self.pushButton_38.sizePolicy().hasHeightForWidth())
         self.pushButton_38.setSizePolicy(sizePolicy3)
-        self.pushButton_38.setMinimumSize(QSize(60, 60))
-        self.pushButton_38.setMaximumSize(QSize(60, 60))
+        self.pushButton_38.setMinimumSize(QSize(30, 30))
+        self.pushButton_38.setMaximumSize(QSize(30, 30))
         self.pushButton_38.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;\n"
 "")
 
-        self.verticalLayout_12.addWidget(self.pushButton_38)
+        self.gridLayout_2.addWidget(self.pushButton_38, 1, 0, 1, 1)
 
         self.pushButton_30 = QPushButton(self.groupBox_6)
         self.pushButton_30.setObjectName(u"pushButton_30")
         sizePolicy3.setHeightForWidth(self.pushButton_30.sizePolicy().hasHeightForWidth())
         self.pushButton_30.setSizePolicy(sizePolicy3)
-        self.pushButton_30.setMinimumSize(QSize(60, 60))
-        self.pushButton_30.setMaximumSize(QSize(60, 60))
+        self.pushButton_30.setMinimumSize(QSize(30, 30))
+        self.pushButton_30.setMaximumSize(QSize(30, 30))
         self.pushButton_30.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_12.addWidget(self.pushButton_30)
+        self.gridLayout_2.addWidget(self.pushButton_30, 2, 0, 1, 1)
 
         self.pushButton_33 = QPushButton(self.groupBox_6)
         self.pushButton_33.setObjectName(u"pushButton_33")
         sizePolicy3.setHeightForWidth(self.pushButton_33.sizePolicy().hasHeightForWidth())
         self.pushButton_33.setSizePolicy(sizePolicy3)
-        self.pushButton_33.setMinimumSize(QSize(60, 60))
-        self.pushButton_33.setMaximumSize(QSize(60, 60))
+        self.pushButton_33.setMinimumSize(QSize(30, 30))
+        self.pushButton_33.setMaximumSize(QSize(30, 30))
         self.pushButton_33.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_12.addWidget(self.pushButton_33)
+        self.gridLayout_2.addWidget(self.pushButton_33, 3, 0, 1, 1)
 
         self.pushButton_34 = QPushButton(self.groupBox_6)
         self.pushButton_34.setObjectName(u"pushButton_34")
-        self.pushButton_34.setMinimumSize(QSize(60, 60))
-        self.pushButton_34.setMaximumSize(QSize(60, 60))
+        self.pushButton_34.setMinimumSize(QSize(30, 30))
+        self.pushButton_34.setMaximumSize(QSize(30, 30))
         self.pushButton_34.setStyleSheet(u"background-color: rgb(123, 123, 123);\n"
 "color: rgb(255,255,255);  \n"
-"border-radius: 30px; \n"
+"border-radius: 15px; \n"
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_12.addWidget(self.pushButton_34)
+        self.gridLayout_2.addWidget(self.pushButton_34, 4, 0, 1, 1)
 
-        self.verticalLayout_12.setStretch(0, 1)
-        self.verticalLayout_12.setStretch(1, 1)
-        self.verticalLayout_12.setStretch(2, 1)
-        self.verticalLayout_12.setStretch(3, 1)
-        self.verticalLayout_12.setStretch(4, 1)
 
-        self.horizontalLayout_8.addLayout(self.verticalLayout_12)
+        self.horizontalLayout_8.addLayout(self.gridLayout_2)
 
-        self.verticalLayout_14 = QVBoxLayout()
-        self.verticalLayout_14.setObjectName(u"verticalLayout_14")
+        self.gridLayout_4 = QGridLayout()
+        self.gridLayout_4.setObjectName(u"gridLayout_4")
         self.pushButton_41 = QPushButton(self.groupBox_6)
         self.pushButton_41.setObjectName(u"pushButton_41")
         sizePolicy3.setHeightForWidth(self.pushButton_41.sizePolicy().hasHeightForWidth())
@@ -749,7 +996,7 @@
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_14.addWidget(self.pushButton_41)
+        self.gridLayout_4.addWidget(self.pushButton_41, 0, 0, 1, 1)
 
         self.pushButton_40 = QPushButton(self.groupBox_6)
         self.pushButton_40.setObjectName(u"pushButton_40")
@@ -763,12 +1010,10 @@
 "font: 9pt \"AcadEref\";\n"
 "border-style: outset;")
 
-        self.verticalLayout_14.addWidget(self.pushButton_40)
+        self.gridLayout_4.addWidget(self.pushButton_40, 1, 0, 1, 1)
 
-        self.verticalLayout_14.setStretch(0, 1)
-        self.verticalLayout_14.setStretch(1, 1)
 
-        self.horizontalLayout_8.addLayout(self.verticalLayout_14)
+        self.horizontalLayout_8.addLayout(self.gridLayout_4)
 
 
         self.verticalLayout_15.addWidget(self.groupBox_6)
@@ -1034,7 +1279,7 @@
         self.retranslateUi(MainWindow)
 
         self.tabWidget.setCurrentIndex(2)
-        self.tabWidget_2.setCurrentIndex(2)
+        self.tabWidget_2.setCurrentIndex(0)
 
 
         QMetaObject.connectSlotsByName(MainWindow)
@@ -1085,14 +1330,27 @@
         self.SessionContrl_gbx.setTitle(QCoreApplication.translate("MainWindow", u"SessionControl(0x10)", None))
         self.SessionContrl_gbx_3.setTitle(QCoreApplication.translate("MainWindow", u"Security(0x27)", None))
         self.SessionContrl_gbx_4.setTitle(QCoreApplication.translate("MainWindow", u"CommControl(0x28)", None))
+        self.SessionContrl_gbx_6.setTitle(QCoreApplication.translate("MainWindow", u"DTC Ctl(0x85)", None))
         self.SessionContrl_gbx_2.setTitle(QCoreApplication.translate("MainWindow", u"ClearDiag(0x14)", None))
         self.SessionContrl_gbx_5.setTitle(QCoreApplication.translate("MainWindow", u"TesterPresent(0x3E)", None))
         self.radioButton.setText("")
         self.pushButton_7.setText(QCoreApplication.translate("MainWindow", u"TesterPresent", None))
+        self.groupBox_9.setTitle(QCoreApplication.translate("MainWindow", u"0x1902\u670d\u52a1", None))
+        self.groupBox_10.setTitle(QCoreApplication.translate("MainWindow", u"0x1904\u670d\u52a1", None))
+        self.groupBox_11.setTitle(QCoreApplication.translate("MainWindow", u"0x190A\u670d\u52a1", None))
+        self.pushButton_49.setText(QCoreApplication.translate("MainWindow", u"\u62a5\u544a\u652f\u6301DTC(190A)", None))
         self.groupBox_3.setTitle(QCoreApplication.translate("MainWindow", u"Security Access", None))
         self.pushButton_31.setText(QCoreApplication.translate("MainWindow", u"Unlock Level 1", None))
         self.pushButton_32.setText(QCoreApplication.translate("MainWindow", u"Unlock Level 3", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QCoreApplication.translate("MainWindow", u"UDS", None))
+        self.pushButton_56.setText(QCoreApplication.translate("MainWindow", u"X2", None))
+        self.pushButton_54.setText(QCoreApplication.translate("MainWindow", u"M+", None))
+        self.pushButton_58.setText(QCoreApplication.translate("MainWindow", u"X1", None))
+        self.pushButton_62.setText(QCoreApplication.translate("MainWindow", u"M", None))
+        self.pushButton_59.setText(QCoreApplication.translate("MainWindow", u"ZERO", None))
+        self.pushButton_61.setText(QCoreApplication.translate("MainWindow", u"M-", None))
+        self.pushButton_60.setText(QCoreApplication.translate("MainWindow", u"Y1", None))
+        self.pushButton_57.setText(QCoreApplication.translate("MainWindow", u"X2", None))
         self.pushButton_9.setText(QCoreApplication.translate("MainWindow", u"Start Calibration", None))
         self.pushButton_11.setText(QCoreApplication.translate("MainWindow", u"Calibration Z", None))
         self.pushButton_13.setText(QCoreApplication.translate("MainWindow", u"Calibration M", None))

--
Gitblit v1.8.0