update 更新图片处理,点位比较方法,夹爪控制
This commit is contained in:
@ -41,11 +41,12 @@ class Catch:
|
||||
else:
|
||||
self.shake_continue.SetReset()
|
||||
self.catch_status = CatchStatus.COk
|
||||
if Constant.Debug or self.robotClient.check_outputQ(self.robotClient.con_ios[2]):
|
||||
self.robotClient.sendIOControl(self.robotClient.con_ios[2], 0)
|
||||
print("震动结束")
|
||||
#if Constant.Debug or self.robotClient.check_outputQ(self.robotClient.con_ios[2]):
|
||||
self.robotClient.sendIOControl(self.robotClient.con_ios[2], 0)
|
||||
print("震动结束")
|
||||
|
||||
if self.catch_status == CatchStatus.COk:
|
||||
self.robotClient.sendIOControl(self.robotClient.con_ios[1], 0)
|
||||
pass
|
||||
|
||||
|
||||
|
||||
@ -206,11 +206,11 @@ class Feeding(QObject):
|
||||
# 0,
|
||||
# 0);
|
||||
|
||||
img_path = f'Image/{self.index}.png'
|
||||
img = cv2.imread(img_path)
|
||||
self.index += 1
|
||||
self.index = self.index % 4
|
||||
self.detection_image = img
|
||||
# img_path = f'Image/{self.index}.png'
|
||||
# img = cv2.imread(img_path)
|
||||
# self.index += 1
|
||||
# self.index = self.index % 4
|
||||
# self.detection_image = img
|
||||
|
||||
if self.feedConfig == None:
|
||||
self.feedStatus = FeedStatus.FNone
|
||||
@ -247,6 +247,7 @@ class Feeding(QObject):
|
||||
log.log_message(logging.INFO, Constant.str_feed_start)
|
||||
if not self.robotClient.origin_position.compare(real_position) and not self.is_reverse:
|
||||
# QMessageBox.information(None, "提示", Constant.str_feed_start_error) # Fuck 引起异常
|
||||
log.log_message(logging.ERROR, Constant.str_feed_start_error)
|
||||
self.need_origin_signal.emit(Constant.str_feed_start_error)
|
||||
self.feedStatus = FeedStatus.FNone
|
||||
return
|
||||
@ -260,8 +261,8 @@ class Feeding(QObject):
|
||||
# = self.detection.get_position(Point_isVision=False, Box_isPoint=True, First_Depth=True, Iter_Max_Pixel=30,
|
||||
# # save_img_point=0, Height_reduce=30, width_reduce=30)
|
||||
|
||||
|
||||
self.feedConfig.feedLine.set_take_position(self.get_take_position())
|
||||
if self.feedConfig.feedLine.get_take_position().get_position() != None:
|
||||
self.feedConfig.feedLine.set_take_position(self.get_take_position())
|
||||
# TODO 获取目标位置
|
||||
#
|
||||
self.feed_Mid_Status = FeedMidStatus.FMid_Start
|
||||
@ -368,8 +369,7 @@ class Feeding(QObject):
|
||||
# self.sendIOControl(self.robotClient.con_ios[1], 1)
|
||||
# self.sendIOControl(self.robotClient.con_ios[2], 1)
|
||||
|
||||
|
||||
|
||||
log.log_message(logging.INFO, "到达抓料点位")
|
||||
if self.catch.catch_status == CatchStatus.CNone :
|
||||
self.catch.catch_status = CatchStatus.CTake
|
||||
return
|
||||
@ -492,7 +492,6 @@ class Feeding(QObject):
|
||||
return
|
||||
pos_model = self.reversed_positions[self.reverse_index]
|
||||
if pos_model.status == FeedStatus.FTake.value: # 跳过取袋节点
|
||||
print('跳过抓袋点位')
|
||||
pos_model = self.reversed_positions[self.reverse_index + 1]
|
||||
self.reverse_index = self.reverse_index+1
|
||||
|
||||
@ -560,10 +559,10 @@ class Feeding(QObject):
|
||||
while self.run_reverse and self.reverse_index!=len(reversed_positions):
|
||||
if self.reverse_index!=0 and not real_position.compare(current_position.get_position()):
|
||||
continue
|
||||
print(f'复位第{self.reverse_index}') #todo 缺少比对
|
||||
#todo 缺少比对
|
||||
pos_model = reversed_positions[self.reverse_index]
|
||||
if pos_model.status == FeedStatus.FTake.value: # 跳过取袋节点
|
||||
print('跳过抓袋点位')
|
||||
|
||||
pos_model = reversed_positions[self.reverse_index + 1]
|
||||
# TODO take节点判断
|
||||
|
||||
@ -627,12 +626,12 @@ class Feeding(QObject):
|
||||
f'U:{position_instruction.m3}-' \
|
||||
f'V:{position_instruction.m4}-' \
|
||||
f'W:{position_instruction.m5}'
|
||||
print(log_str)
|
||||
|
||||
|
||||
try:
|
||||
log.log_message(logging.INFO, log_str)
|
||||
except:
|
||||
print("error")
|
||||
return
|
||||
|
||||
self.robotClient.add_sendQuene(request_command)
|
||||
pass
|
||||
@ -640,16 +639,15 @@ class Feeding(QObject):
|
||||
if Constant.Debug:
|
||||
return self.robotClient.status_model.getRealPosition()
|
||||
_, img, xyz, uvw, points = self.detection.get_position(Point_isVision=False, Box_isPoint=True, First_Depth=True, Iter_Max_Pixel=30,save_img_point=0, Height_reduce=30, width_reduce=30)
|
||||
self.detection_image = img
|
||||
self.detection_image = img.copy()
|
||||
if xyz ==None or uvw==None or points==None:
|
||||
return None
|
||||
target_position,noraml_base = getPosition(*xyz,*uvw,None,points)
|
||||
|
||||
position = Real_Position().init_position(*target_position[:3],*noraml_base[:3])
|
||||
position.Z = position.Z+40
|
||||
position.Z = position.Z+200
|
||||
return position
|
||||
def next_start(self,reverse=False):
|
||||
print(f'原点到初始位置的第{self.feedConfig.feedLine.origin2start_pos_index}')
|
||||
start_pos = self.feedConfig.feedLine.get_next_start_position(reverse)
|
||||
self.feedStatus = FeedStatus(start_pos.status) if self.feedStatus != FeedStatus.FNone else FeedStatus.FNone
|
||||
if start_pos.lineType == LineType.CureMid.value:
|
||||
@ -667,7 +665,7 @@ class Feeding(QObject):
|
||||
pass
|
||||
|
||||
def next_take(self,reverse=False):
|
||||
print(f'初始位置到拍照点的第{self.feedConfig.feedLine.start2take_pos_index}')
|
||||
|
||||
take_pos = self.feedConfig.feedLine.get_next_take_position(reverse)
|
||||
self.feedStatus = FeedStatus(take_pos.status) if self.feedStatus != FeedStatus.FNone else FeedStatus.FNone
|
||||
if take_pos.lineType == LineType.CureMid.value:
|
||||
@ -679,7 +677,6 @@ class Feeding(QObject):
|
||||
pass
|
||||
|
||||
def next_Feed(self,reverse=False):
|
||||
print(f'拍照到抛料回来的第{self.feedConfig.feedLine.feeding2end_pos_index}')
|
||||
feed_pos = self.feedConfig.feedLine.get_next_feed_position(reverse)
|
||||
self.feedStatus = FeedStatus(feed_pos.status) if self.feedStatus != FeedStatus.FNone else FeedStatus.FNone
|
||||
if feed_pos.lineType == LineType.CureMid.value:
|
||||
|
||||
Reference in New Issue
Block a user