update 更新界面图标,增加余料显示,增加日志图标

This commit is contained in:
FrankCV2048
2024-10-24 23:08:12 +08:00
parent 83a25c1080
commit 343e24bccd
9 changed files with 228 additions and 28 deletions

View File

@ -110,7 +110,7 @@ class Feeding():
elif self.feedStatus == FeedStatus.FPhoto:
log.log_message(logging.INFO, Constant.str_feed_photo)
if self.feedConfig.feedLine.photo_position.compare(real_position):
code, img, xyz, uvw = self.detection.get_position() #检测结果
code, img, xyz, uvw, mng = self.detection.get_position() #检测结果
log.log_message(logging.INFO, Constant.str_feed_takePhoto)
self.detection_image = img
if xyz!=None:
@ -125,8 +125,7 @@ class Feeding():
self.robotClient.status_model.world_5)
# 黄老师给我的xyz和法向量
target_position, noraml_base = getPosition(*xyz, *uvw,rotation)
target_position, noraml_base = getPosition(*xyz, *uvw,rotation,*mng)
log.log_message(logging.INFO, Constant.str_feed_covert_success)
self.feedConfig.feedLine.take_position = Real_Position().init_position(*target_position[:3],*noraml_base)
self.feedStatus = FeedStatus.FTake