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-07 16:16:20 +08:00
parent 65c4db96e0
commit d4fcb79394
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.py
View File

@ -39,7 +39,7 @@ from CU.Command import Status
from Util.util_log import log
from Vision.detect_person import DetectionPerson
from ui_MainWin import Ui_MainWindow
from view.ResetView import StopDialog
#from view.ResetView import StopDialog
class MainWindow(QMainWindow, Ui_MainWindow):
@ -574,7 +574,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
float(self.configReader.get('Robot_Feed', 'photo_u5')),float(self.configReader.get('Robot_Feed', 'photo_v5')),float(self.configReader.get('Robot_Feed', 'photo_w5'))
)
]
origin_position = Real_Position(float(self.configReader.get('Origin', 'X')),
origin_position = Real_Position().init_position(float(self.configReader.get('Origin', 'X')),
float(self.configReader.get('Origin', 'Y')),
float(self.configReader.get('Origin', 'Z')),
float(self.configReader.get('Origin', 'U')),
@ -1150,8 +1150,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
return
thread = threading.Thread(target=self.feeding.return_original_position())
thread.start()
dialog_reset = StopDialog()
dialog_reset.stop_thread_signal.connect(self.stop_reset_thread)
# dialog_reset = StopDialog()
# dialog_reset.stop_thread_signal.connect(self.stop_reset_thread)
def stop_reset_thread(self):
self.feeding.run_reverse = False
@ -1305,7 +1305,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.updateUI_IOPanel()
self.updateUI_InfoMB()
def updateUI_InfoMB(self):
if self.cton_take_no_photo.Q(self.feeding.take_no_photo):
if self.cton_take_no_photo.Q(self.feeding.take_no_photo,True):
self.show_infomessage_box("未识别到料袋报警，请重新放料后，点击继续")
self.send_pause_command(pause=1)
self.feeding.pause = True
@ -1487,7 +1487,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
position_instruction.m4 = float(x5)
position_instruction.m5 = float(x6)
position_instruction.action = move_type.value
position_instruction.speed=Constant.debug_speed
position_instruction.speed=self.robotClient.debug_speed
instruction_command = CMDInstructRequest()
instruction_command.instructions.append(position_instruction)
request_command = instruction_command.toString()