Skip to content
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

Jump to bottom

Adding in Object Tracking #11

Merged
merged 31 commits into from
Mar 17, 2021
Merged

Adding in Object Tracking #11

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
55fccd2
adding flight tracking
luke-iqt Mar 3, 2021
8de398d
added back in
luke-iqt Mar 3, 2021
2fa172f
moved
luke-iqt Mar 3, 2021
90c7d50
Update install_requirements.sh
luke-iqt Mar 3, 2021
9916682
Update detect.py
luke-iqt Mar 3, 2021
a8a6923
Update detect.py
luke-iqt Mar 3, 2021
55beaef
Update camera.py
luke-iqt Mar 3, 2021
b8ef54a
Update camera.py
luke-iqt Mar 3, 2021
521b5d4
make it global
luke-iqt Mar 3, 2021
b5623ca
Update camera.py
luke-iqt Mar 3, 2021
a1dd8ef
Update camera.py
luke-iqt Mar 3, 2021
85289ff
scale to camera image dimensions
luke-iqt Mar 3, 2021
06e97dd
Update docker-compose.yml
luke-iqt Mar 3, 2021
8ef16ff
Update detect.py
luke-iqt Mar 3, 2021
e44b04c
print stuff
luke-iqt Mar 3, 2021
160f066
Update detect.py
luke-iqt Mar 3, 2021
8b75262
Update detect.py
luke-iqt Mar 3, 2021
b3aabfe
Update camera.py
luke-iqt Mar 3, 2021
3635e45
Update camera.py
luke-iqt Mar 3, 2021
0b09ae3
Update detect.py
luke-iqt Mar 3, 2021
f4d0d24
Update detect.py
luke-iqt Mar 3, 2021
900a8d2
Update detect.py
luke-iqt Mar 3, 2021
bc414cf
motion control
luke-iqt Mar 3, 2021
be5967d
Update detect.py
luke-iqt Mar 3, 2021
56f329b
Update camera.py
luke-iqt Mar 3, 2021
bce5322
Update detect.py
luke-iqt Mar 3, 2021
35a4b58
less compression
luke-iqt Mar 5, 2021
1d4269f
more gain
luke-iqt Mar 5, 2021
7d9746e
Update camera.py
luke-iqt Mar 6, 2021
c193f62
switch to bmp
luke-iqt Mar 6, 2021
6c38484
back to jpg
luke-iqt Mar 6, 2021
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
Prev Previous commit
Next Next commit
Update detect.py
  • Loading branch information
@luke-iqt
luke-iqt committed Mar 3, 2021
commit 160f066f503627f97e18656de2434b4aa839f46a
4 changes: 2 additions & 2 deletions object-tracker/opencv/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def object_to_follow( objs, labels, trdata, trackerFlag):
best_score = obj_score

obj_id = int(obj[5].item())
print("x0: {} y0: {} x1: {} y1: {}".format(x0,y0,x1,y0))
print("x0: {} y0: {} x1: {} y1: {}".format(x0,y0,x1,y1))
follow_x = x0 + ((x1 - x0)/2)
follow_y = y0 + ((y1 - y0)/2)
else:
Expand All @@ -262,7 +262,7 @@ def object_to_follow( objs, labels, trdata, trackerFlag):
best_score = obj_score

obj_id = int(obj[5].item())
print("x0: {} y0: {} x1: {} y1: {}".format(x0,y0,x1,y0))
print("x0: {} y0: {} x1: {} y1: {}".format(x0,y0,x1,y1))

follow_x = x0 + ((x1 - x0)/2)
follow_y = y0 + ((y1 - y0)/2)
Expand Down