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-11 22:21:33 +08:00
parent c81ccecc7d
commit ec57c6d543
7 changed files with 464 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
main.py
View File

@ -980,23 +980,23 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.robotClient.debug_speed = int(self.lineEdit_speed_debug.text())
self.robotClient.reset_speed = int(self.lineEdit_speed_reset.text())
try:
solenoid1_addr = int(self.lineEdit_solenoid1_addr.text())
solenoid2_addr = int(self.lineEdit_solenoid2_addr.text())
solenoid3_addr = int(self.lineEdit_solenoid3_addr.text())
take_addr = int(self.lineEdit_take_addr.text())
press_addr = int(self.lineEdit_press_addr.text())
shake_addr = int(self.lineEdit_shake_addr.text())
time_delay_take = float(self.lineEdit_timedelay_take.text())
time_delay_put = float(self.lineEdit_timedelay_put.text())
time_delay_shake = float(self.lineEdit_timedelay_shake.text())
self.robotClient.con_ios[0] = solenoid1_addr
self.robotClient.con_ios[1] = solenoid2_addr
self.robotClient.con_ios[2] = solenoid3_addr
self.robotClient.con_ios[0] = take_addr
self.robotClient.con_ios[1] = press_addr
self.robotClient.con_ios[2] = shake_addr
self.robotClient.time_delay_take = time_delay_take
self.robotClient.time_delay_put = time_delay_put
self.robotClient.time_delay_shake = time_delay_shake
self.configReader = configparser.ConfigParser()
self.configReader.read(Constant.set_ini)
self.configReader.set('Robot_Feed', 'solenoid_valve1_addr', str(solenoid1_addr))
self.configReader.set('Robot_Feed', 'solenoid_valve2_addr', str(solenoid2_addr))
self.configReader.set('Robot_Feed', 'solenoid_valve3_addr', str(solenoid3_addr))
self.configReader.set('Robot_Feed', 'solenoid_valve1_addr', str(take_addr))
self.configReader.set('Robot_Feed', 'solenoid_valve2_addr', str(press_addr))
self.configReader.set('Robot_Feed', 'solenoid_valve3_addr', str(shake_addr))
self.configReader.set('Robot_Feed', 'takeDelay', str(time_delay_take))
self.configReader.set('Robot_Feed', 'putDelay', str(time_delay_put))
self.configReader.set('Robot_Feed', 'shakeDelay', str(time_delay_shake))
@ -1314,14 +1314,21 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.label_date.setText(datetime.now().strftime("%Y-%m-%d"))
self.label_time.setText(datetime.now().strftime("%H:%M:%S"))
# self.updateUI_Position()
# self.updateUI_label_detection()
# self.updateUI_label_status()
# self.updateUI_frame_sign(self.feeding.feedStatus)
# self.updateUI_IOPanel()
# self.updateUI_InfoMB()
self.updateUI_Position()
self.updateUI_label_detection()
self.updateUI_label_status()
self.updateUI_frame_sign(self.feeding.feedStatus)
self.updateUI_IOPanel()
self.updateUI_InfoMB()
def updateRobotSeting(self):
self.lineEdit_origin_x.setText(str(self.robotClient.origin_position.X))
self.lineEdit_origin_y.setText(str(self.robotClient.origin_position.Y))
self.lineEdit_origin_z.setText(str(self.robotClient.origin_position.Z))
self.lineEdit_origin_u.setText(str(self.robotClient.origin_position.U))
self.lineEdit_origin_v.setText(str(self.robotClient.origin_position.V))
self.lineEdit_origin_w.setText(str(self.robotClient.origin_position.W))
def updateUI_InfoMB(self):
if self.cton_take_no_photo.Q(self.feeding.take_no_photo,True):
@ -1775,6 +1782,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.show_infomessage_box("设置原点失败")
def updateUI_Photo_Set(self):
self.lineEdit_x1.setText(str(self.robotClient.photo_locs[0][0]))
self.lineEdit_y1.setText(str(self.robotClient.photo_locs[0][1]))
@ -1811,9 +1819,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.lineEdit_speed_run.setText(str(self.robotClient.feed_speed))
self.lineEdit_speed_debug.setText(str(self.robotClient.debug_speed))
self.lineEdit_speed_reset.setText(str(self.robotClient.reset_speed))
self.lineEdit_solenoid1_addr.setText(str(self.robotClient.con_ios[0]))
self.lineEdit_solenoid2_addr.setText(str(self.robotClient.con_ios[1]))
self.lineEdit_solenoid3_addr.setText(str(self.robotClient.con_ios[2]))
self.lineEdit_take_addr.setText(str(self.robotClient.con_ios[0]))
self.lineEdit_press_addr.setText(str(self.robotClient.con_ios[1]))
self.lineEdit_shake_addr.setText(str(self.robotClient.con_ios[2]))
self.lineEdit_timedelay_take.setText(str(self.robotClient.time_delay_take))
self.lineEdit_timedelay_put.setText(str(self.robotClient.time_delay_put))
self.lineEdit_timedelay_shake.setText(str(self.robotClient.time_delay_shake))
@ -1830,6 +1838,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if index == 0:
self.updateUI_Select_Line()
if index == 2:
self.updateRobotSeting()
self.updateUI_Photo_Set()
if index == 3:
self.updateUI_Base_Set()