diff --git a/main.ui b/main.ui
index 0e51a80..890ddf1 100644
--- a/main.ui
+++ b/main.ui
@@ -6,8 +6,8 @@
0
0
- 600
- 850
+ 930
+ 630
@@ -18,13 +18,13 @@
- 600
- 850
+ 930
+ 630
- 600
+ 1200
850
@@ -44,7 +44,7 @@
0
0
- 601
+ 931
271
@@ -64,7 +64,7 @@
10
280
191
- 81
+ 131
@@ -126,9 +126,9 @@
- 10
- 510
- 581
+ 450
+ 280
+ 471
121
@@ -181,7 +181,7 @@
10
80
- 561
+ 451
16
@@ -228,7 +228,7 @@
- 520
+ 410
60
51
24
@@ -244,7 +244,7 @@
- 520
+ 410
90
51
24
@@ -301,9 +301,9 @@
- 420
+ 360
30
- 151
+ 101
24
@@ -323,7 +323,7 @@
- 330
+ 650
0
271
31
@@ -355,8 +355,8 @@
220
280
- 371
- 231
+ 221
+ 301
@@ -372,8 +372,8 @@
10
20
- 351
- 201
+ 201
+ 271
@@ -390,9 +390,9 @@
10
- 370
+ 420
191
- 141
+ 161
@@ -506,9 +506,9 @@
- 10
- 630
- 581
+ 450
+ 410
+ 471
171
@@ -561,7 +561,7 @@
10
70
- 561
+ 451
16
@@ -608,7 +608,7 @@
- 520
+ 410
50
51
24
@@ -624,7 +624,7 @@
- 520
+ 410
80
51
24
@@ -658,7 +658,7 @@
- 520
+ 410
110
51
24
@@ -709,7 +709,7 @@
10
100
- 561
+ 451
16
@@ -722,7 +722,7 @@
10
130
- 561
+ 451
16
@@ -751,7 +751,7 @@
- 520
+ 410
140
51
24
@@ -786,7 +786,7 @@
0
0
- 600
+ 930
22
diff --git a/ui_mainwindow.py b/ui_mainwindow.py
index 8932912..af44177 100644
--- a/ui_mainwindow.py
+++ b/ui_mainwindow.py
@@ -23,14 +23,14 @@ class Ui_MainWindow(object):
def setupUi(self, MainWindow):
if not MainWindow.objectName():
MainWindow.setObjectName(u"MainWindow")
- MainWindow.resize(600, 850)
+ MainWindow.resize(930, 630)
sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
MainWindow.setSizePolicy(sizePolicy)
- MainWindow.setMinimumSize(QSize(600, 850))
- MainWindow.setMaximumSize(QSize(600, 850))
+ MainWindow.setMinimumSize(QSize(930, 630))
+ MainWindow.setMaximumSize(QSize(1200, 850))
icon = QIcon()
icon.addFile(u"favicon.ico", QSize(), QIcon.Normal, QIcon.Off)
MainWindow.setWindowIcon(icon)
@@ -39,12 +39,12 @@ class Ui_MainWindow(object):
self.centralwidget.setObjectName(u"centralwidget")
self.label = QLabel(self.centralwidget)
self.label.setObjectName(u"label")
- self.label.setGeometry(QRect(0, 0, 601, 271))
+ self.label.setGeometry(QRect(0, 0, 931, 271))
self.label.setPixmap(QPixmap(u"banner.jpg"))
self.label.setScaledContents(True)
self.groupBox = QGroupBox(self.centralwidget)
self.groupBox.setObjectName(u"groupBox")
- self.groupBox.setGeometry(QRect(10, 280, 191, 81))
+ self.groupBox.setGeometry(QRect(10, 280, 191, 131))
font = QFont()
font.setPointSize(11)
self.groupBox.setFont(font)
@@ -65,7 +65,7 @@ class Ui_MainWindow(object):
self.label_5.setStyleSheet(u"color: red;")
self.groupBox_5 = QGroupBox(self.centralwidget)
self.groupBox_5.setObjectName(u"groupBox_5")
- self.groupBox_5.setGeometry(QRect(10, 510, 581, 121))
+ self.groupBox_5.setGeometry(QRect(450, 280, 471, 121))
self.groupBox_5.setFont(font)
self.label_7 = QLabel(self.groupBox_5)
self.label_7.setObjectName(u"label_7")
@@ -79,7 +79,7 @@ class Ui_MainWindow(object):
self.label_8.setFont(font2)
self.line = QFrame(self.groupBox_5)
self.line.setObjectName(u"line")
- self.line.setGeometry(QRect(10, 80, 561, 16))
+ self.line.setGeometry(QRect(10, 80, 451, 16))
self.line.setFrameShape(QFrame.HLine)
self.line.setFrameShadow(QFrame.Sunken)
self.lRes1 = QLabel(self.groupBox_5)
@@ -94,11 +94,11 @@ class Ui_MainWindow(object):
self.lRes2.setFont(font3)
self.bRes1 = QPushButton(self.groupBox_5)
self.bRes1.setObjectName(u"bRes1")
- self.bRes1.setGeometry(QRect(520, 60, 51, 24))
+ self.bRes1.setGeometry(QRect(410, 60, 51, 24))
self.bRes1.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.bRes2 = QPushButton(self.groupBox_5)
self.bRes2.setObjectName(u"bRes2")
- self.bRes2.setGeometry(QRect(520, 90, 51, 24))
+ self.bRes2.setGeometry(QRect(410, 90, 51, 24))
self.bBiao = QPushButton(self.groupBox_5)
self.bBiao.setObjectName(u"bBiao")
self.bBiao.setGeometry(QRect(20, 30, 151, 24))
@@ -115,14 +115,14 @@ class Ui_MainWindow(object):
self.label_4.setStyleSheet(u"color: red;")
self.bAna = QPushButton(self.groupBox_5)
self.bAna.setObjectName(u"bAna")
- self.bAna.setGeometry(QRect(420, 30, 151, 24))
+ self.bAna.setGeometry(QRect(360, 30, 101, 24))
font5 = QFont()
font5.setPointSize(12)
self.bAna.setFont(font5)
self.bAna.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.label_9 = QLabel(self.centralwidget)
self.label_9.setObjectName(u"label_9")
- self.label_9.setGeometry(QRect(330, 0, 271, 31))
+ self.label_9.setGeometry(QRect(650, 0, 271, 31))
font6 = QFont()
font6.setFamilies([u"\u6977\u4f53"])
font6.setPointSize(12)
@@ -134,16 +134,16 @@ class Ui_MainWindow(object):
self.label_9.setMargin(6)
self.groupBox_6 = QGroupBox(self.centralwidget)
self.groupBox_6.setObjectName(u"groupBox_6")
- self.groupBox_6.setGeometry(QRect(220, 280, 371, 231))
+ self.groupBox_6.setGeometry(QRect(220, 280, 221, 301))
self.groupBox_6.setFont(font)
self.vLog = QListView(self.groupBox_6)
self.vLog.setObjectName(u"vLog")
- self.vLog.setGeometry(QRect(10, 20, 351, 201))
+ self.vLog.setGeometry(QRect(10, 20, 201, 271))
self.vLog.setFont(font3)
self.vLog.setStyleSheet(u"")
self.groupBox_2 = QGroupBox(self.centralwidget)
self.groupBox_2.setObjectName(u"groupBox_2")
- self.groupBox_2.setGeometry(QRect(10, 370, 191, 141))
+ self.groupBox_2.setGeometry(QRect(10, 420, 191, 161))
self.groupBox_2.setFont(font)
self.bWebSite = QPushButton(self.groupBox_2)
self.bWebSite.setObjectName(u"bWebSite")
@@ -170,7 +170,7 @@ class Ui_MainWindow(object):
self.bStart.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.groupBox_7 = QGroupBox(self.centralwidget)
self.groupBox_7.setObjectName(u"groupBox_7")
- self.groupBox_7.setGeometry(QRect(10, 630, 581, 171))
+ self.groupBox_7.setGeometry(QRect(450, 410, 471, 171))
self.groupBox_7.setFont(font)
self.label_10 = QLabel(self.groupBox_7)
self.label_10.setObjectName(u"label_10")
@@ -182,7 +182,7 @@ class Ui_MainWindow(object):
self.label_11.setFont(font2)
self.line_2 = QFrame(self.groupBox_7)
self.line_2.setObjectName(u"line_2")
- self.line_2.setGeometry(QRect(10, 70, 561, 16))
+ self.line_2.setGeometry(QRect(10, 70, 451, 16))
self.line_2.setFrameShape(QFrame.HLine)
self.line_2.setFrameShadow(QFrame.Sunken)
self.lCalRes1 = QLabel(self.groupBox_7)
@@ -195,11 +195,11 @@ class Ui_MainWindow(object):
self.lCalRes2.setFont(font3)
self.bOpenCalRes1 = QPushButton(self.groupBox_7)
self.bOpenCalRes1.setObjectName(u"bOpenCalRes1")
- self.bOpenCalRes1.setGeometry(QRect(520, 50, 51, 24))
+ self.bOpenCalRes1.setGeometry(QRect(410, 50, 51, 24))
self.bOpenCalRes1.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.bOpenCalRes2 = QPushButton(self.groupBox_7)
self.bOpenCalRes2.setObjectName(u"bOpenCalRes2")
- self.bOpenCalRes2.setGeometry(QRect(520, 80, 51, 24))
+ self.bOpenCalRes2.setGeometry(QRect(410, 80, 51, 24))
self.bCal = QPushButton(self.groupBox_7)
self.bCal.setObjectName(u"bCal")
self.bCal.setGeometry(QRect(20, 30, 151, 24))
@@ -207,7 +207,7 @@ class Ui_MainWindow(object):
self.bCal.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.bOpenCalRes3 = QPushButton(self.groupBox_7)
self.bOpenCalRes3.setObjectName(u"bOpenCalRes3")
- self.bOpenCalRes3.setGeometry(QRect(520, 110, 51, 24))
+ self.bOpenCalRes3.setGeometry(QRect(410, 110, 51, 24))
self.label_12 = QLabel(self.groupBox_7)
self.label_12.setObjectName(u"label_12")
self.label_12.setGeometry(QRect(10, 120, 91, 16))
@@ -218,12 +218,12 @@ class Ui_MainWindow(object):
self.lCalRes3.setFont(font3)
self.line_3 = QFrame(self.groupBox_7)
self.line_3.setObjectName(u"line_3")
- self.line_3.setGeometry(QRect(10, 100, 561, 16))
+ self.line_3.setGeometry(QRect(10, 100, 451, 16))
self.line_3.setFrameShape(QFrame.HLine)
self.line_3.setFrameShadow(QFrame.Sunken)
self.line_4 = QFrame(self.groupBox_7)
self.line_4.setObjectName(u"line_4")
- self.line_4.setGeometry(QRect(10, 130, 561, 16))
+ self.line_4.setGeometry(QRect(10, 130, 451, 16))
self.line_4.setFrameShape(QFrame.HLine)
self.line_4.setFrameShadow(QFrame.Sunken)
self.label_13 = QLabel(self.groupBox_7)
@@ -232,7 +232,7 @@ class Ui_MainWindow(object):
self.label_13.setFont(font2)
self.bOpenCalRes4 = QPushButton(self.groupBox_7)
self.bOpenCalRes4.setObjectName(u"bOpenCalRes4")
- self.bOpenCalRes4.setGeometry(QRect(520, 140, 51, 24))
+ self.bOpenCalRes4.setGeometry(QRect(410, 140, 51, 24))
self.lCalRes4 = QLabel(self.groupBox_7)
self.lCalRes4.setObjectName(u"lCalRes4")
self.lCalRes4.setGeometry(QRect(110, 150, 401, 16))
@@ -240,7 +240,7 @@ class Ui_MainWindow(object):
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QMenuBar(MainWindow)
self.menubar.setObjectName(u"menubar")
- self.menubar.setGeometry(QRect(0, 0, 600, 22))
+ self.menubar.setGeometry(QRect(0, 0, 930, 22))
MainWindow.setMenuBar(self.menubar)
self.statusbar = QStatusBar(MainWindow)
self.statusbar.setObjectName(u"statusbar")