Skip to content

Update detector.py #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update detector.py #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aacfbfd
Update detector.py
mriamnobody Oct 7, 2022
8d83e32
Update detector.py
mriamnobody Oct 7, 2022
4dd9116
Update detector.py
mriamnobody Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/yolov7_reid/src/detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,34 +183,35 @@ def detection_with_image(frame, display_in_queue=True):
combined_img = yolov7_detector.draw_detections_with_predefined_colors(frame,person_bboxes, person_scores, person_class_ids,pre_colors)

send_image = False
if unknown > 0:
if unknown > 0 and unknown ==1:
send_image = True
if unknown == 1:
telegram_bot.send('SharpAI saw one unfamiliar person')
else:
telegram_bot.send(f'SharpAI saw {unknown} unfamiliar people')
telegram_bot.send('SharpAI saw one unfamiliar person')

else:
telegram_bot.send(f'SharpAI saw {unknown} unfamiliar people')

elif total > 0:
print(f'SharpAI saw {total} person')
current_ts = time.time()
if current_ts - previous_known_person_ts > 30*60:
if current_ts - previous_known_person_ts > 30*60 and total > 1:
send_image = True
previous_known_person_ts = current_ts
if total > 1:
telegram_bot.send(f'SharpAI saw {total} familiar people')
telegram_bot.send(f'SharpAI saw {total} familiar people')

else:
telegram_bot.send(f'SharpAI saw one familiar person')

if send_image == True:
if send_image == True and display_in_queue == True:
print('send image to telegram, display locally')
filepath = '/tmp/to_send.jpg'
cv2.imwrite(filepath,combined_img)
telegram_bot.send_image(filepath)

if display_in_queue == True:
try:
q.put_nowait(filepath)
except queue.Full:
print('display queue full')
try:
q.put_nowait(filepath)
except queue.Full:
print('display queue full')

else:
try:
cv2.namedWindow("Detection result", cv2.WINDOW_NORMAL)
Expand Down