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 6a85577..a85b1d6 100644 Binary files a/db/jtDB.db and b/db/jtDB.db differ 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 924dd84..b0dd2df 100644 Binary files a/utils/__pycache__/config_loader.cpython-310.pyc and b/utils/__pycache__/config_loader.cpython-310.pyc differ 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)