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:
FrankCV2048
2024-12-13 23:02:22 +08:00
parent b804b52b1f
commit d231d9fcc8
10 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main.py
View File

@ -415,7 +415,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.table_line_changed = True
def tabel_get_position(self,row_i):
self.set_position_tabel(row_i,self.status_address.getRealPosition())
if self.tableWidget_line_positions.currentRow()==-1:
QMessageBox.information(self, "提示", Constant.str_sys_set_position_error)
return
row_i = self.tableWidget_line_positions.currentRow()
combox_line_type = self.tableWidget_line_positions.cellWidget(row_i, 7)
lineType = combox_line_type.currentData()
if lineType == 4:
self.set_position_tabel(row_i, self.status_address.getAnglePosition())
else:
self.set_position_tabel(row_i, self.status_address.getRealPosition())
self.table_line_changed = True
def tabel_delete_position(self,row_i):
@ -429,6 +439,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
combox_lineType.addItem("直线",0)
combox_lineType.addItem("曲线中间点",2)
combox_lineType.addItem("曲线终点",3)
combox_lineType.addItem("自由路径",4)
combox_lineType.setCurrentIndex(combox_lineType.findData(position_model.lineType))
combox_lineType.currentIndexChanged.connect(self.send_table_position_status_changed)
self.tableWidget_line_positions.setCellWidget(row_i, 7, combox_lineType)
@ -461,6 +472,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.table_position_changed = True
def set_position_tabel(self, row_i, position):
self.tableWidget_line_positions.setItem(row_i, 1, QTableWidgetItem(str(position.X)))
self.tableWidget_line_positions.setItem(row_i, 2, QTableWidgetItem(str(position.Y)))
self.tableWidget_line_positions.setItem(row_i, 3, QTableWidgetItem(str(position.Z)))
@ -615,12 +628,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
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'))
max_angle_interval = float(self.configReader.get('Robot_Feed', 'max_angle_interval'))
#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,[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
self.robotClient.max_angle_interval = max_angle_interval
self.feeding = Feeding(self.robotClient, self.detection) # 临时
self.feeding.need_origin_signal.connect(self.show_infomessage_box)
self.feeding.take_no_photo_sigal.emit(self.show_no_photo_message_box)