界面优化，监控逻辑优化
This commit is contained in:
@ -19,15 +19,15 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QFormLayout,
|
||||
QFrame, QHBoxLayout, QHeaderView, QLabel,
|
||||
QLineEdit, QMainWindow, QPlainTextEdit, QPushButton,
|
||||
QScrollArea, QSizePolicy, QSpacerItem, QStackedWidget,
|
||||
QStatusBar, QTabWidget, QTreeWidget, QTreeWidgetItem,
|
||||
QVBoxLayout, QWidget)
|
||||
QStatusBar, QTabWidget, QToolButton, QTreeWidget,
|
||||
QTreeWidgetItem, QVBoxLayout, QWidget)
|
||||
|
||||
class Ui_MainWindow(QMainWindow):
|
||||
def setupUi(self, MainWindow):
|
||||
if not MainWindow.objectName():
|
||||
MainWindow.setObjectName(u"MainWindow")
|
||||
MainWindow.setEnabled(True)
|
||||
MainWindow.resize(1004, 560)
|
||||
MainWindow.resize(1006, 568)
|
||||
sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
|
||||
sizePolicy.setHorizontalStretch(0)
|
||||
sizePolicy.setVerticalStretch(0)
|
||||
@ -174,18 +174,15 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.horizontalLayout.addWidget(self.le_data_path)
|
||||
|
||||
self.btn_data_open = QPushButton(self.tab_data)
|
||||
self.btn_data_open.setObjectName(u"btn_data_open")
|
||||
self.btn_data_open.setMaximumSize(QSize(30, 16777215))
|
||||
self.btn_data_open.setFont(font4)
|
||||
self.toolButton = QToolButton(self.tab_data)
|
||||
self.toolButton.setObjectName(u"toolButton")
|
||||
|
||||
self.horizontalLayout.addWidget(self.btn_data_open)
|
||||
self.horizontalLayout.addWidget(self.toolButton)
|
||||
|
||||
self.horizontalLayout.setStretch(0, 1)
|
||||
self.horizontalLayout.setStretch(1, 1)
|
||||
self.horizontalLayout.setStretch(2, 1)
|
||||
self.horizontalLayout.setStretch(3, 10)
|
||||
self.horizontalLayout.setStretch(4, 1)
|
||||
|
||||
self.verticalLayout.addLayout(self.horizontalLayout)
|
||||
|
||||
@ -235,18 +232,15 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.hl_2_unit1.addWidget(self.le_unit_path)
|
||||
|
||||
self.btn_unit_open = QPushButton(self.tab_unit)
|
||||
self.btn_unit_open.setObjectName(u"btn_unit_open")
|
||||
self.btn_unit_open.setMaximumSize(QSize(30, 16777215))
|
||||
self.btn_unit_open.setFont(font4)
|
||||
self.toolButton_2 = QToolButton(self.tab_unit)
|
||||
self.toolButton_2.setObjectName(u"toolButton_2")
|
||||
|
||||
self.hl_2_unit1.addWidget(self.btn_unit_open)
|
||||
self.hl_2_unit1.addWidget(self.toolButton_2)
|
||||
|
||||
self.hl_2_unit1.setStretch(0, 1)
|
||||
self.hl_2_unit1.setStretch(1, 1)
|
||||
self.hl_2_unit1.setStretch(2, 1)
|
||||
self.hl_2_unit1.setStretch(3, 10)
|
||||
self.hl_2_unit1.setStretch(4, 1)
|
||||
|
||||
self.verticalLayout_2.addLayout(self.hl_2_unit1)
|
||||
|
||||
@ -287,7 +281,7 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.sa_durable.setWidgetResizable(True)
|
||||
self.scrollAreaWidgetContents = QWidget()
|
||||
self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
|
||||
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 212, 78))
|
||||
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 213, 78))
|
||||
self.horizontalLayout_9 = QHBoxLayout(self.scrollAreaWidgetContents)
|
||||
self.horizontalLayout_9.setObjectName(u"horizontalLayout_9")
|
||||
self.verticalLayout_5 = QVBoxLayout()
|
||||
@ -343,13 +337,14 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.horizontalLayout_6.addWidget(self.le_durable_path)
|
||||
|
||||
self.btn_durable_open = QPushButton(self.tab_durable)
|
||||
self.btn_durable_open.setObjectName(u"btn_durable_open")
|
||||
self.btn_durable_open.setMaximumSize(QSize(30, 16777215))
|
||||
self.btn_durable_open.setFont(font4)
|
||||
self.toolButton_3 = QToolButton(self.tab_durable)
|
||||
self.toolButton_3.setObjectName(u"toolButton_3")
|
||||
|
||||
self.horizontalLayout_6.addWidget(self.btn_durable_open)
|
||||
self.horizontalLayout_6.addWidget(self.toolButton_3)
|
||||
|
||||
self.horizontalLayout_6.setStretch(0, 1)
|
||||
self.horizontalLayout_6.setStretch(1, 10)
|
||||
self.horizontalLayout_6.setStretch(2, 1)
|
||||
|
||||
self.verticalLayout_6.addLayout(self.horizontalLayout_6)
|
||||
|
||||
@ -371,17 +366,8 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.horizontalLayout_7.addWidget(self.le_durable_interval)
|
||||
|
||||
self.label_10 = QLabel(self.tab_durable)
|
||||
self.label_10.setObjectName(u"label_10")
|
||||
sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
|
||||
sizePolicy2.setHorizontalStretch(0)
|
||||
sizePolicy2.setVerticalStretch(0)
|
||||
sizePolicy2.setHeightForWidth(self.label_10.sizePolicy().hasHeightForWidth())
|
||||
self.label_10.setSizePolicy(sizePolicy2)
|
||||
self.label_10.setMinimumSize(QSize(30, 0))
|
||||
|
||||
self.horizontalLayout_7.addWidget(self.label_10)
|
||||
|
||||
self.horizontalLayout_7.setStretch(0, 1)
|
||||
self.horizontalLayout_7.setStretch(1, 10)
|
||||
|
||||
self.verticalLayout_6.addLayout(self.horizontalLayout_7)
|
||||
|
||||
@ -505,10 +491,10 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.horizontalLayout_5.addWidget(self.pte_hmi_send)
|
||||
|
||||
self.pte_him_recv = QPlainTextEdit(self.page)
|
||||
self.pte_him_recv.setObjectName(u"pte_him_recv")
|
||||
self.pte_hmi_recv = QPlainTextEdit(self.page)
|
||||
self.pte_hmi_recv.setObjectName(u"pte_hmi_recv")
|
||||
|
||||
self.horizontalLayout_5.addWidget(self.pte_him_recv)
|
||||
self.horizontalLayout_5.addWidget(self.pte_hmi_recv)
|
||||
|
||||
|
||||
self.verticalLayout_10.addLayout(self.horizontalLayout_5)
|
||||
@ -746,23 +732,23 @@ class Ui_MainWindow(QMainWindow):
|
||||
|
||||
self.verticalLayout_4 = QVBoxLayout()
|
||||
self.verticalLayout_4.setObjectName(u"verticalLayout_4")
|
||||
self.pushButton = QPushButton(self.tab_network)
|
||||
self.pushButton.setObjectName(u"pushButton")
|
||||
self.pushButton.setFont(font5)
|
||||
self.hmi_btn = QPushButton(self.tab_network)
|
||||
self.hmi_btn.setObjectName(u"hmi_btn")
|
||||
self.hmi_btn.setFont(font5)
|
||||
|
||||
self.verticalLayout_4.addWidget(self.pushButton)
|
||||
self.verticalLayout_4.addWidget(self.hmi_btn)
|
||||
|
||||
self.pushButton_2 = QPushButton(self.tab_network)
|
||||
self.pushButton_2.setObjectName(u"pushButton_2")
|
||||
self.pushButton_2.setFont(font5)
|
||||
self.md_btn = QPushButton(self.tab_network)
|
||||
self.md_btn.setObjectName(u"md_btn")
|
||||
self.md_btn.setFont(font5)
|
||||
|
||||
self.verticalLayout_4.addWidget(self.pushButton_2)
|
||||
self.verticalLayout_4.addWidget(self.md_btn)
|
||||
|
||||
self.pushButton_3 = QPushButton(self.tab_network)
|
||||
self.pushButton_3.setObjectName(u"pushButton_3")
|
||||
self.pushButton_3.setFont(font5)
|
||||
self.ec_btn = QPushButton(self.tab_network)
|
||||
self.ec_btn.setObjectName(u"ec_btn")
|
||||
self.ec_btn.setFont(font5)
|
||||
|
||||
self.verticalLayout_4.addWidget(self.pushButton_3)
|
||||
self.verticalLayout_4.addWidget(self.ec_btn)
|
||||
|
||||
|
||||
self.horizontalLayout_12.addLayout(self.verticalLayout_4)
|
||||
@ -877,11 +863,11 @@ class Ui_MainWindow(QMainWindow):
|
||||
MainWindow.setCentralWidget(self.centralwidget)
|
||||
self.statusbar = QStatusBar(MainWindow)
|
||||
self.statusbar.setObjectName(u"statusbar")
|
||||
sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
|
||||
sizePolicy3.setHorizontalStretch(0)
|
||||
sizePolicy3.setVerticalStretch(0)
|
||||
sizePolicy3.setHeightForWidth(self.statusbar.sizePolicy().hasHeightForWidth())
|
||||
self.statusbar.setSizePolicy(sizePolicy3)
|
||||
sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
|
||||
sizePolicy2.setHorizontalStretch(0)
|
||||
sizePolicy2.setVerticalStretch(0)
|
||||
sizePolicy2.setHeightForWidth(self.statusbar.sizePolicy().hasHeightForWidth())
|
||||
self.statusbar.setSizePolicy(sizePolicy2)
|
||||
self.statusbar.setMinimumSize(QSize(0, 27))
|
||||
self.statusbar.setStyleSheet(u"background-color: rgb(200, 200, 200);")
|
||||
MainWindow.setStatusBar(self.statusbar)
|
||||
@ -890,11 +876,8 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.btn_start.clicked.connect(MainWindow.prog_start)
|
||||
self.btn_stop.clicked.connect(MainWindow.prog_stop)
|
||||
self.btn_reset.clicked.connect(MainWindow.prog_reset)
|
||||
self.btn_durable_open.clicked.connect(MainWindow.file_browser)
|
||||
self.btn_draw.clicked.connect(MainWindow.curve_draw)
|
||||
self.cb_durable_total.checkStateChanged.connect(MainWindow.durable_cb_change)
|
||||
self.btn_unit_open.clicked.connect(MainWindow.file_browser)
|
||||
self.btn_data_open.clicked.connect(MainWindow.file_browser)
|
||||
self.btn_docs_previous.clicked.connect(MainWindow.pre_page)
|
||||
self.btn_docs_realtime.clicked.connect(MainWindow.realtime_page)
|
||||
self.btn_docs_next.clicked.connect(MainWindow.next_page)
|
||||
@ -902,9 +885,9 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.le_docs_search.returnPressed.connect(MainWindow.search_keyword)
|
||||
self.cb_hmi_cmd.currentTextChanged.connect(MainWindow.hmi_cb_change)
|
||||
self.btn_hmi_send.clicked.connect(MainWindow.hmi_send)
|
||||
self.pushButton.clicked.connect(MainWindow.hmi_page)
|
||||
self.pushButton_2.clicked.connect(MainWindow.md_page)
|
||||
self.pushButton_3.clicked.connect(MainWindow.ec_page)
|
||||
self.hmi_btn.clicked.connect(MainWindow.hmi_page)
|
||||
self.md_btn.clicked.connect(MainWindow.md_page)
|
||||
self.ec_btn.clicked.connect(MainWindow.ec_page)
|
||||
self.cb_md_cmd.currentTextChanged.connect(MainWindow.md_cb_change)
|
||||
self.btn_md_send.clicked.connect(MainWindow.md_send)
|
||||
self.btn_ec_send.clicked.connect(MainWindow.ec_send)
|
||||
@ -916,6 +899,10 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.le_hmi_ip.returnPressed.connect(MainWindow.hmi_conn)
|
||||
self.tw_docs.currentChanged.connect(MainWindow.switch_log_tab)
|
||||
self.treew_log.itemDoubleClicked.connect(MainWindow.show_item_content)
|
||||
self.cb_data_func.currentTextChanged.connect(MainWindow.data_cb_change)
|
||||
self.toolButton.clicked.connect(MainWindow.file_browser)
|
||||
self.toolButton_2.clicked.connect(MainWindow.file_browser)
|
||||
self.toolButton_3.clicked.connect(MainWindow.file_browser)
|
||||
|
||||
self.tw_funcs.setCurrentIndex(0)
|
||||
self.sw_network.setCurrentIndex(0)
|
||||
@ -941,7 +928,7 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.cb_data_current.setItemText(2, QCoreApplication.translate("MainWindow", u"\u5e73\u5747\u503c", None))
|
||||
|
||||
self.label_4.setText(QCoreApplication.translate("MainWindow", u"\u8def\u5f84", None))
|
||||
self.btn_data_open.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.toolButton.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.tw_funcs.setTabText(self.tw_funcs.indexOf(self.tab_data), QCoreApplication.translate("MainWindow", u"\u6570\u636e\u5904\u7406", None))
|
||||
self.cb_unit_func.setItemText(0, QCoreApplication.translate("MainWindow", u"\u5236\u52a8", None))
|
||||
self.cb_unit_func.setItemText(1, QCoreApplication.translate("MainWindow", u"\u8f6c\u77e9", None))
|
||||
@ -952,19 +939,18 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.cb_unit_tool.setItemText(3, QCoreApplication.translate("MainWindow", u"inertia", None))
|
||||
|
||||
self.label_6.setText(QCoreApplication.translate("MainWindow", u"\u8def\u5f84", None))
|
||||
self.btn_unit_open.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.toolButton_2.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.tw_funcs.setTabText(self.tw_funcs.indexOf(self.tab_unit), QCoreApplication.translate("MainWindow", u"\u6574\u673a\u6d4b\u8bd5", None))
|
||||
self.label_11.setText(QCoreApplication.translate("MainWindow", u"\u9009\u62e9\u6307\u6807", None))
|
||||
self.cb_1.setText(QCoreApplication.translate("MainWindow", u"\u5468\u671f\u5185\u5e73\u5747\u8f6c\u77e9", None))
|
||||
self.cb_2.setText(QCoreApplication.translate("MainWindow", u"\u5468\u671f\u5185\u6700\u5927\u901f\u5ea6", None))
|
||||
self.label_8.setText(QCoreApplication.translate("MainWindow", u"\u8def\u5f84", None))
|
||||
self.btn_durable_open.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.toolButton_3.setText(QCoreApplication.translate("MainWindow", u"...", None))
|
||||
self.label_9.setText(QCoreApplication.translate("MainWindow", u"\u95f4\u9694", None))
|
||||
#if QT_CONFIG(whatsthis)
|
||||
self.le_durable_interval.setWhatsThis("")
|
||||
#endif // QT_CONFIG(whatsthis)
|
||||
self.le_durable_interval.setPlaceholderText(QCoreApplication.translate("MainWindow", u"\u6bcf\u6b21\u6570\u636e\u91c7\u96c6\u7684\u65f6\u95f4\u95f4\u9694\uff0c\u9ed8\u8ba4(\u6700\u5c0f)300s", None))
|
||||
self.label_10.setText("")
|
||||
self.cb_durable_total.setText(QCoreApplication.translate("MainWindow", u"\u5168\u90e8\u6253\u5f00/\u5173\u95ed", None))
|
||||
self.btn_draw.setText(QCoreApplication.translate("MainWindow", u"\u7ed8\u56fe", None))
|
||||
self.label_3.setText("")
|
||||
@ -1053,16 +1039,16 @@ class Ui_MainWindow(QMainWindow):
|
||||
self.cb_ec_cmd.setItemText(52, QCoreApplication.translate("MainWindow", u"safe_door_open", None))
|
||||
self.cb_ec_cmd.setItemText(53, QCoreApplication.translate("MainWindow", u"soft_estop_state", None))
|
||||
self.cb_ec_cmd.setItemText(54, QCoreApplication.translate("MainWindow", u"cart_vel", None))
|
||||
self.cb_ec_cmd.setItemText(55, QCoreApplication.translate("MainWindow", u"tcp_pos", None))
|
||||
self.cb_ec_cmd.setItemText(55, QCoreApplication.translate("MainWindow", u"tcp_pose", None))
|
||||
self.cb_ec_cmd.setItemText(56, QCoreApplication.translate("MainWindow", u"tcp_vel", None))
|
||||
self.cb_ec_cmd.setItemText(57, QCoreApplication.translate("MainWindow", u"tcp_vel_mag", None))
|
||||
self.cb_ec_cmd.setItemText(58, QCoreApplication.translate("MainWindow", u"ext_estop_state", None))
|
||||
self.cb_ec_cmd.setItemText(59, QCoreApplication.translate("MainWindow", u"hand_estop_state", None))
|
||||
|
||||
self.btn_ec_send.setText(QCoreApplication.translate("MainWindow", u"\u53d1\u9001", None))
|
||||
self.pushButton.setText(QCoreApplication.translate("MainWindow", u"HMI", None))
|
||||
self.pushButton_2.setText(QCoreApplication.translate("MainWindow", u"Modbus", None))
|
||||
self.pushButton_3.setText(QCoreApplication.translate("MainWindow", u"EC", None))
|
||||
self.hmi_btn.setText(QCoreApplication.translate("MainWindow", u"HMI", None))
|
||||
self.md_btn.setText(QCoreApplication.translate("MainWindow", u"Modbus", None))
|
||||
self.ec_btn.setText(QCoreApplication.translate("MainWindow", u"EC", None))
|
||||
self.tw_funcs.setTabText(self.tw_funcs.indexOf(self.tab_network), QCoreApplication.translate("MainWindow", u"\u7f51\u7edc\u8bbe\u7f6e", None))
|
||||
self.tw_docs.setTabText(self.tw_docs.indexOf(self.tab_output), QCoreApplication.translate("MainWindow", u"\u8f93\u51fa", None))
|
||||
___qtreewidgetitem = self.treew_log.headerItem()
|
||||
|
||||
Reference in New Issue
Block a user