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

Cleaned and remade feature extraction. #159

Merged
merged 103 commits into from
Apr 23, 2024
Merged

Cleaned and remade feature extraction. #159

merged 103 commits into from
Apr 23, 2024

Conversation

MBTMBTMBT
Copy link
Collaborator

No description provided.

Benteng Ma and others added 30 commits December 5, 2023 18:30
testtesttest
0751e37
Test
a8f97ce
Test
5fe6a93
Message Change
768ad46
@MBTMBTMBT
Merge pull request #1 from MBTMBTMBT/12_6
a807b48 
Message Change
fixed message writting and reading
6452c1d
fixed image crop
5818b5e
Updated the feature extraction node and changed the messages.
4ed5176
@MBTMBTMBT
Merge pull request #2 from MBTMBTMBT/12_6
d4581c7 
12 6
fixed that torsal and head frames were inversed.
7e3c7af
@MBTMBTMBT
Merge pull request #3 from MBTMBTMBT/12_6
4fa8ced 
fixed that torsal and head frames were inversed.
Changed colour format from BGR to RGB within the detection process.
2d88e78
keep the saved model
d4ba82c
keep the model file
8f29414
keep the saved model
8291007
Cancel saving the images (but sitll cannot see use cv2.imshow)
5654c3c
Runnable demo
9bca082
added the hair colour distribution matching method
5b034f6
retrained model is very robust so changed the threshold
e19e9df
Moving the head to meet the person.
9343487
xyz axis readable.
98535a0
(Hopefully) Runnable with 3d input.
ecd469e
Speak normally.
a4bfa70
Try to move the head.
2a1e8d7
testtesttest
684d51b
Test
d0c27e2
Test
4903409
Message Change
0dfc09a
fixed message writting and reading
f9743ae
fixed image crop
47ebc7c
jws-1
jws-1 requested changes Apr 18, 2024
View reviewed changes
Copy link
Member

@jws-1 jws-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awaiting changes

common/helpers/cv2_img/src/cv2_img/__init__.py Outdated Show resolved Hide resolved
common/helpers/cv2_img/src/cv2_img/__init__.py Outdated Show resolved Hide resolved
common/helpers/cv2_img/src/cv2_img/__init__.py Outdated Show resolved Hide resolved
common/helpers/feature_extractor/package.xml Outdated Show resolved Hide resolved
common/helpers/numpy2message/package.xml Outdated Show resolved Hide resolved
skills/src/lasr_skills/describe_people.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/image_msg_to_cv2.py Outdated Show resolved Hide resolved
tasks/receptionist/launch/setup.launch Outdated Show resolved Hide resolved
tasks/receptionist/src/receptionist/head_direction_test.py Outdated Show resolved Hide resolved
tasks/receptionist/src/receptionist/states/speakdescriptions.py Outdated Show resolved Hide resolved
jws-1
jws-1 approved these changes Apr 23, 2024
View reviewed changes
Copy link
Member

@jws-1 jws-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of minor comments, but the rest looks good! Looking forward to seeing a live demonstration, and then we can merge this in! 🥳

common/helpers/numpy2message/package.xml Outdated Show resolved Hide resolved
common/helpers/numpy2message/package.xml Outdated Show resolved Hide resolved
common/vision/lasr_vision_feature_extraction/package.xml Outdated Show resolved Hide resolved
skills/src/lasr_skills/describe_people.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/get_image.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/get_image.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/get_image.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/get_image.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/get_image.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/vision/image_msg_to_cv2.py Outdated Show resolved Hide resolved
Benteng Ma and others added 13 commits April 23, 2024 16:49
Fixed a stupid naming issue of feature extractor.
8e867d1
@MBTMBTMBT @jws-1
Update common/helpers/numpy2message/package.xml
8c272cb 
Co-authored-by: Jared Swift <[email protected]>
@MBTMBTMBT @jws-1
Update common/helpers/numpy2message/package.xml
9bcd878 
Co-authored-by: Jared Swift <[email protected]>
@MBTMBTMBT @jws-1
Update common/vision/lasr_vision_feature_extraction/package.xml
38b73ad 
Co-authored-by: Jared Swift <[email protected]>
Canceled the default neck coordinates and leave it to be a failure.
a761bab
Merge branch 'main' of https://github.com/MBTMBTMBT/LASR_ben
8ec2fa0
Canceled the loop of getting mixed images, and renamed the keys.
c1b15b9
renamed the function.
9bffac0
@MBTMBTMBT @jws-1
Update skills/src/lasr_skills/vision/get_image.py
378579b 
Co-authored-by: Jared Swift <[email protected]>
@MBTMBTMBT @jws-1
Update skills/src/lasr_skills/vision/get_image.py
8f45600 
Co-authored-by: Jared Swift <[email protected]>
@MBTMBTMBT @jws-1
Update skills/src/lasr_skills/vision/image_msg_to_cv2.py
9d73eb5 
Co-authored-by: Jared Swift <[email protected]>
Update the new names in init.
a3f6db2
removed a print and rename the imports.
c6f3a5d
jws-1
jws-1 approved these changes Apr 23, 2024
View reviewed changes
Copy link
Member

@jws-1 jws-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job. (Also saw working demo).

@jws-1 jws-1 merged commit 62c5f74 into LASR-at-Home:main Apr 23, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jws-1 jws-1 jws-1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MBTMBTMBT @jws-1