diff --git a/GUI/ChildWindow_1.py b/GUI/ChildWindow_1.py
index 7f5e8e2..755596a 100644
--- a/GUI/ChildWindow_1.py
+++ b/GUI/ChildWindow_1.py
@@ -257,6 +257,9 @@ def retranslateUi(self, Form):
self.label_13.setText(QCoreApplication.translate("Form", u"\u5f17\u5170\u514b\u5c14\n"
"\u7f3a\u9677\u5bf9\u6570\u91cf", None))
self.finish.setText(QCoreApplication.translate("Form", u"\u5b8c\u6210", None))
+#if QT_CONFIG(shortcut)
+ self.finish.setShortcut(QCoreApplication.translate("Form", u"Return", None))
+#endif // QT_CONFIG(shortcut)
self.label_14.setText(QCoreApplication.translate("Form", u"K", None))
self.label_15.setText(QCoreApplication.translate("Form", u"K", None))
self.label_16.setText(QCoreApplication.translate("Form", u"ps", None))
diff --git a/GUI/ChildWindow_1.ui b/GUI/ChildWindow_1.ui
index 33f8f61..334fe78 100644
--- a/GUI/ChildWindow_1.ui
+++ b/GUI/ChildWindow_1.ui
@@ -602,6 +602,9 @@ color: rgb(0, 0, 0);
完成
+
+ Return
+
diff --git a/GUI/ChildWindow_2.py b/GUI/ChildWindow_2.py
index 0832694..b14639d 100644
--- a/GUI/ChildWindow_2.py
+++ b/GUI/ChildWindow_2.py
@@ -317,6 +317,9 @@ def retranslateUi(self, Form):
self.label_11.setText(QCoreApplication.translate("Form", u"\u7cfb\u7efc", None))
self.label_9.setText(QCoreApplication.translate("Form", u"\u5f1b\u8c6b\u65f6\u95f4", None))
self.finish.setText(QCoreApplication.translate("Form", u"\u5b8c\u6210", None))
+#if QT_CONFIG(shortcut)
+ self.finish.setShortcut(QCoreApplication.translate("Form", u"Return", None))
+#endif // QT_CONFIG(shortcut)
self.label_12.setText(QCoreApplication.translate("Form", u"\u6a21\u62df\u65f6\u95f4", None))
self.label_6.setText(QCoreApplication.translate("Form", u"\u521d\u59cb\u6e29\u5ea6", None))
self.label.setText(QCoreApplication.translate("Form", u"\u5b9e\u9a8c\u4e8c", None))
diff --git a/GUI/ChildWindow_2.ui b/GUI/ChildWindow_2.ui
index 13c68cc..6e22536 100644
--- a/GUI/ChildWindow_2.ui
+++ b/GUI/ChildWindow_2.ui
@@ -322,6 +322,9 @@ color: rgb(0, 0, 0);
完成
+
+ Return
+
diff --git a/GUI/MainWindow_GUI.py b/GUI/MainWindow_GUI.py
index fb742a5..93fb29c 100644
--- a/GUI/MainWindow_GUI.py
+++ b/GUI/MainWindow_GUI.py
@@ -16,10 +16,9 @@
QIcon, QImage, QKeySequence, QLinearGradient,
QPainter, QPalette, QPixmap, QRadialGradient,
QTransform)
-
-from PySide6.QtWidgets import (QApplication, QLabel, QLineEdit, QMainWindow,
- QMenu, QMenuBar, QPushButton, QSizePolicy,
- QStatusBar, QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QComboBox, QLabel, QLineEdit,
+ QMainWindow, QMenu, QMenuBar, QPushButton,
+ QSizePolicy, QStatusBar, QVBoxLayout, QWidget)
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
@@ -76,9 +75,6 @@ def setupUi(self, MainWindow):
self.label_2.setObjectName(u"label_2")
self.label_2.setGeometry(QRect(1240, 830, 111, 31))
self.label_2.setFont(font1)
- self.pushButton_2 = QPushButton(self.centralwidget)
- self.pushButton_2.setObjectName(u"pushButton_2")
- self.pushButton_2.setGeometry(QRect(810, 877, 681, 41))
self.pushButton_3 = QPushButton(self.centralwidget)
self.pushButton_3.setObjectName(u"pushButton_3")
self.pushButton_3.setGeometry(QRect(10, 880, 221, 41))
@@ -91,6 +87,10 @@ def setupUi(self, MainWindow):
self.exp_res_lineEdit_2 = QLineEdit(self.centralwidget)
self.exp_res_lineEdit_2.setObjectName(u"exp_res_lineEdit_2")
self.exp_res_lineEdit_2.setGeometry(QRect(1160, 830, 71, 31))
+ self.exp_res_lineEdit_2.setFont(font1)
+ self.comboBox = QComboBox(self.centralwidget)
+ self.comboBox.setObjectName(u"comboBox")
+ self.comboBox.setGeometry(QRect(810, 877, 681, 41))
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QMenuBar(MainWindow)
self.menubar.setObjectName(u"menubar")
@@ -133,8 +133,7 @@ def retranslateUi(self, MainWindow):
self.action_save.setText(QCoreApplication.translate("MainWindow", u"\u53e6\u5b58\u4e3a", None))
self.label.setText(QCoreApplication.translate("MainWindow", u"\u754c\u9762\u70ed\u5bfc\u7387\uff1a", None))
self.label_2.setText(QCoreApplication.translate("MainWindow", u"W*K-1*m-1", None))
- self.pushButton_2.setText(QCoreApplication.translate("MainWindow", u"PushButton", None))
- self.pushButton_3.setText(QCoreApplication.translate("MainWindow", u"\u5207\u6362", None))
+ self.pushButton_3.setText(QCoreApplication.translate("MainWindow", u"\u65e0\u9ad8\u4eae\u663e\u793a", None))
self.menu.setTitle(QCoreApplication.translate("MainWindow", u"\u6587\u4ef6", None))
self.menu_2.setTitle(QCoreApplication.translate("MainWindow", u"\u65b0\u5efa", None))
self.menu_3.setTitle(QCoreApplication.translate("MainWindow", u"\u7f16\u8f91", None))
diff --git a/GUI/MainWindow_GUI.ui b/GUI/MainWindow_GUI.ui
index d3998e9..403b578 100644
--- a/GUI/MainWindow_GUI.ui
+++ b/GUI/MainWindow_GUI.ui
@@ -52,7 +52,7 @@
1030
540
- 521
+ 471
271
@@ -96,19 +96,6 @@
W*K-1*m-1
-
-
-
- 810
- 877
- 681
- 41
-
-
-
- PushButton
-
-
@@ -119,7 +106,7 @@
- 切换
+ 无高亮显示
@@ -142,6 +129,22 @@
31
+
+
+ 宋体
+ 12
+
+
+
+
+
+
+ 810
+ 877
+ 681
+ 41
+
+