xiongyi/AutoControlSystem-git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 补充部分

Browse Source
This commit is contained in:
Gogs
2024-12-12 10:37:25 +08:00
parent 744d8744ff
commit 7a26238219
2 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.py
View File

@ -192,6 +192,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.pushButton_savePosition.clicked.connect(self.send_save_lines_data)
def send_table_line_position_cell_changed(self):
self.table_position_changed = True
def send_table_lines_cell_changed(self):
self.table_line_changed = True
def send_save_lines_data(self):
@ -335,7 +337,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
header.setSectionResizeMode(i, PySide6.QtWidgets.QHeaderView.ResizeMode.Interactive)
self.tableWidget_line_positions.setContextMenuPolicy(PySide6.QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
self.tableWidget_line_positions.customContextMenuRequested.connect(self.show_positions_context_menu)
self.tableWidget_line_positions.cellChanged.connect(self.send_table_line_position_cell_changed)
def init_table_positions_data(self,position_list):
self.tableWidget_line_positions.setRowCount(0)
for index,position_model in enumerate(position_list):
@ -602,15 +604,15 @@ class MainWindow(QMainWindow, Ui_MainWindow):
debug_speed = int(self.configReader.get('Speed', 'debug_speed'))
feed_speed = int(self.configReader.get('Speed', 'feed_speed'))
reset_speed = int(self.configReader.get('Speed', 'reset_speed'))
solenoid_valve1_addr = int(self.configReader.get('Robot_Feed', 'solenoid_valve1_addr'))
solenoid_valve2_addr = int(self.configReader.get('Robot_Feed', 'solenoid_valve2_addr'))
solenoid_valve3_addr = int(self.configReader.get('Robot_Feed', 'solenoid_valve3_addr'))
io_take_addr = int(self.configReader.get('Robot_Feed', 'io_take_addr'))
io_zip_addr = int(self.configReader.get('Robot_Feed', 'io_zip_addr'))
io_shake_addr = int(self.configReader.get('Robot_Feed', 'io_shake_addr'))
time_delay_take = float(self.configReader.get('Robot_Feed', 'takeDelay'))
time_delay_put = float(self.configReader.get('Robot_Feed', 'putDelay'))
time_delay_shake = float(self.configReader.get('Robot_Feed', 'shakeDelay'))
#TODO
#dropDelay_time = int(self.configReader.get('Robot_Feed', 'dropDelay_time'))
self.robotClient = RobotClient(ip, port, photo_locs, self.command_position_quene, self.status_address,[solenoid_valve1_addr, solenoid_valve2_addr, solenoid_valve3_addr],time_delay_take,time_delay_put,time_delay_shake,origin_position)
self.robotClient = RobotClient(ip, port, photo_locs, self.command_position_quene, self.status_address,[io_take_addr, io_zip_addr, io_shake_addr],time_delay_take,time_delay_put,time_delay_shake,origin_position)
self.robotClient.debug_speed = debug_speed
self.robotClient.feed_speed = feed_speed
self.robotClient.reset_speed = reset_speed