From 935fd44f78f19c9a0ccfacf2a6b55bcd0e6a3bdb Mon Sep 17 00:00:00 2001 From: zhu-mengmeng <15588200382@163.com> Date: Fri, 13 Jun 2025 15:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=96=99=E4=B8=8B?= =?UTF-8?q?=E6=96=99=E6=8C=89=E9=92=AE=E4=BB=A5=E5=8F=8A=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app_config.json | 2 +- db/jtDB.db | Bin 49152 -> 49152 bytes ui/main_window_ui.py | 20 +++++++++--------- .../__pycache__/config_loader.cpython-310.pyc | Bin 4192 -> 4192 bytes widgets/main_window.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/app_config.json b/config/app_config.json index e96b4c6..7e456a2 100644 --- a/config/app_config.json +++ b/config/app_config.json @@ -4,7 +4,7 @@ "version": "1.0.0", "features": { "enable_serial_ports": false, - "enable_keyboard_listener": true, + "enable_keyboard_listener": false, "enable_camera": false } }, diff --git a/db/jtDB.db b/db/jtDB.db index 6a8557740368ceeb931b8420974a3dadda91e267..a85b1d6972e44eaf98e754d9e5c193eff95d0d62 100644 GIT binary patch delta 1032 zcmZo@U~Xt&o*>P*Vxo*QT)04Ta^m{M%yR77li4?Dig5OD`f~DdoaV^k&}aX^zL7nTU3;^jz;iZc zhbFGc+PfsRfbmn1SX^vmU}UOmV5Vybk0aE`b!g&*DCg!TM!8KB$K;PoCDaWqnVAV0 zZPUaKRm;RgNUc>9+vJT)BvmX4DU4}iovgT5qTaxehsV&+2;I#_RwhPP1_qF1h-?;6 z!oOQX`+lX`)~#iq;pj&(h&7t8C- zE(>IsSojPWVkQd;L~P!(NS}#0rZIN1;$8`E14|wrLnDKN#Ny(~AC@XjR#?RCKOp2e5H6iZTE}WTWZiglfsjA?s$d8Zt023QRt*NPKe59-hg`>-3nD8qtO=rFT7L1pwVOsI&k8 diff --git a/ui/main_window_ui.py b/ui/main_window_ui.py index 66cf74b..c6151f3 100644 --- a/ui/main_window_ui.py +++ b/ui/main_window_ui.py @@ -285,13 +285,13 @@ class MainWindowUI(QMainWindow): } """ - # self.input_button = QPushButton("上料") - # self.input_button.setFont(self.normal_font) - # self.input_button.setStyleSheet(button_style + "background-color: #e3f2fd; border: 1px solid #2196f3;") + self.input_button = QPushButton("上料") + self.input_button.setFont(self.normal_font) + self.input_button.setStyleSheet(button_style + "background-color: #e3f2fd; border: 1px solid #2196f3;") - # self.output_button = QPushButton("下料") - # self.output_button.setFont(self.normal_font) - # self.output_button.setStyleSheet(button_style + "background-color: #fff8e1; border: 1px solid #ffc107;") + self.output_button = QPushButton("下料") + self.output_button.setFont(self.normal_font) + self.output_button.setStyleSheet(button_style + "background-color: #fff8e1; border: 1px solid #ffc107;") self.start_button = QPushButton("开始") self.start_button.setFont(self.normal_font) @@ -302,10 +302,10 @@ class MainWindowUI(QMainWindow): self.stop_button.setStyleSheet(button_style + "background-color: #ffebee; border: 1px solid #f44336;") # 使用网格布局排列按钮 - # self.button_layout.addWidget(self.input_button, 0, 0) - # self.button_layout.addWidget(self.output_button, 0, 1) - self.button_layout.addWidget(self.start_button, 0, 1) - self.button_layout.addWidget(self.stop_button, 0, 2) + self.button_layout.addWidget(self.input_button, 0, 0) + self.button_layout.addWidget(self.output_button, 0, 1) + self.button_layout.addWidget(self.start_button, 0, 2) + self.button_layout.addWidget(self.stop_button, 0, 3) self.control_layout.addWidget(self.button_container) diff --git a/utils/__pycache__/config_loader.cpython-310.pyc b/utils/__pycache__/config_loader.cpython-310.pyc index 924dd845c2a6ac61a000d1d7414167c9605ccde9..b0dd2df2521dd8fb951de060fbab575e7cdaee4d 100644 GIT binary patch delta 20 acmaE$@IZk(pO=@50SFe>d2i$n6#xJ`O$90d delta 20 acmaE$@IZk(pO=@50SJtWy*6@(3IG5%{RFQ7 diff --git a/widgets/main_window.py b/widgets/main_window.py index 52fc53a..159d05a 100644 --- a/widgets/main_window.py +++ b/widgets/main_window.py @@ -243,8 +243,8 @@ class MainWindow(MainWindowUI): self.tray_edit.activated.connect(self.load_finished_inspection_data) # 当用户选择一项时触发 # 连接按钮事件 - # self.input_button.clicked.connect(self.handle_input) - # self.output_button.clicked.connect(self.handle_output) + self.input_button.clicked.connect(self.handle_input) + self.output_button.clicked.connect(self.handle_output) self.start_button.clicked.connect(self.handle_start) self.stop_button.clicked.connect(self.handle_stop)