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

Cleaned and remade feature extraction. #159

Merged
merged 103 commits into from
Apr 23, 2024
Merged

Cleaned and remade feature extraction. #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
0751e37
testtesttest
Dec 5, 2023
a8f97ce
Test
Dec 5, 2023
5fe6a93
Test
Dec 5, 2023
768ad46
Message Change
Dec 6, 2023
a807b48
Merge pull request #1 from MBTMBTMBT/12_6
MBTMBTMBT Dec 6, 2023
6452c1d
fixed message writting and reading
Dec 7, 2023
5818b5e
fixed image crop
Dec 7, 2023
4ed5176
Updated the feature extraction node and changed the messages.
Dec 7, 2023
d4581c7
Merge pull request #2 from MBTMBTMBT/12_6
MBTMBTMBT Dec 7, 2023
7e3c7af
fixed that torsal and head frames were inversed.
Dec 8, 2023
4fa8ced
Merge pull request #3 from MBTMBTMBT/12_6
MBTMBTMBT Dec 8, 2023
2d88e78
Changed colour format from BGR to RGB within the detection process.
Dec 8, 2023
d4ba82c
keep the saved model
Dec 8, 2023
8f29414
keep the model file
Dec 8, 2023
8291007
keep the saved model
Dec 8, 2023
5654c3c
Cancel saving the images (but sitll cannot see use cv2.imshow)
Dec 8, 2023
9bca082
Runnable demo
Dec 11, 2023
5b034f6
added the hair colour distribution matching method
Dec 13, 2023
e19e9df
retrained model is very robust so changed the threshold
Dec 14, 2023
9343487
Moving the head to meet the person.
Jan 31, 2024
98535a0
xyz axis readable.
Feb 2, 2024
ecd469e
(Hopefully) Runnable with 3d input.
Feb 5, 2024
a4bfa70
Speak normally.
Feb 5, 2024
2a1e8d7
Try to move the head.
Feb 5, 2024
684d51b
testtesttest
Dec 5, 2023
d0c27e2
Test
Dec 5, 2023
4903409
Test
Dec 5, 2023
0dfc09a
Message Change
Dec 6, 2023
f9743ae
fixed message writting and reading
Dec 7, 2023
47ebc7c
fixed image crop
Dec 7, 2023
e8b2012
Updated the feature extraction node and changed the messages.
Dec 7, 2023
77feadb
fixed that torsal and head frames were inversed.
Dec 8, 2023
c096166
Changed colour format from BGR to RGB within the detection process.
Dec 8, 2023
67804ec
keep the saved model
Dec 8, 2023
cc860ac
keep the model file
Dec 8, 2023
8f54363
keep the saved model
Dec 8, 2023
7827dc2
Cancel saving the images (but sitll cannot see use cv2.imshow)
Dec 8, 2023
134c870
Runnable demo
Dec 11, 2023
3c6743f
added the hair colour distribution matching method
Dec 13, 2023
c1b50a5
retrained model is very robust so changed the threshold
Dec 14, 2023
2ed42a4
Moving the head to meet the person.
Jan 31, 2024
6282d2d
xyz axis readable.
Feb 2, 2024
a15a9d9
(Hopefully) Runnable with 3d input.
Feb 5, 2024
29060c0
ah
Feb 5, 2024
ef0a5f1
At least the head moves, not looking at me though.
Feb 8, 2024
205b52e
Merge branch 'LASR-at-Home:main' into main
MBTMBTMBT Feb 18, 2024
86e7a3e
Cleaned the file to have only one model appear.
Feb 23, 2024
3e384d1
Replace the old model with the new one.
Feb 23, 2024
1cb2e3b
merging
Feb 23, 2024
d66fcb3
correct the lost module.
Feb 23, 2024
aa8ec6e
info update
Feb 23, 2024
c65ccd1
fixed issues in the service
Feb 23, 2024
af28931
fixed a stupic typo
Feb 23, 2024
b91b736
runnable version for full demo
Feb 23, 2024
ae3975c
Merge branch 'main' into update-model
MBTMBTMBT Feb 23, 2024
4f78c7e
Merge pull request #4 from MBTMBTMBT/update-model
MBTMBTMBT Feb 23, 2024
d4a677a
Recover the state machine for demo.
Feb 23, 2024
7d1d84b
Added a simple loop to refresh the frame taken, should work fine.
Feb 27, 2024
8db1cb3
Cleaned some commented code.
Mar 11, 2024
5765e66
removed loading the pretrained parameters
Mar 11, 2024
dc3868e
removed load pretrained parameter.
Mar 11, 2024
703b3e8
renamed torch_module into feature_extractor (Recompile needed!!!)
Mar 11, 2024
5480abc
renamed torch_module into feature_extractor
Mar 11, 2024
109201a
renamed lasr_vision_torch to lasr_vision_feature_extraction
Mar 11, 2024
a274cdc
removed some unused code comments
Mar 11, 2024
d967c51
removed colour estimation module
Mar 11, 2024
d43e5ab
removed colour_estimation dependence
Mar 11, 2024
feb4e80
cleaned usused comments
Mar 11, 2024
d7c7a00
cleaned comments
Mar 11, 2024
4b626e9
renamed torch_module to feature_extractor
Mar 11, 2024
f5b3cda
removed unused import, launch file and functions.
Mar 11, 2024
216aba0
reset <arg name="whisper_device_param" default="9" />
Mar 11, 2024
45f8334
Remade to achieve easier bodipix model loading
Mar 22, 2024
6721361
added a break in the loop
Mar 22, 2024
0fbe28f
I don't really understand why this is in my branch, please ignore thi…
Apr 17, 2024
643bf89
Replace string return with json string return.
Apr 17, 2024
8cc1d7e
Merge pull request #5 from MBTMBTMBT/repository-clean-mar11
MBTMBTMBT Apr 18, 2024
4d969ac
Merge remote-tracking branch 'upstream/main'
Apr 18, 2024
44b17b2
pcl functioned remoeved because appeared repetitively.
Apr 18, 2024
689fd0c
replaced the model and predictor initialization, put "__main__"
Apr 18, 2024
a8eadfc
Merged model classes file into predictor's file
Apr 19, 2024
6b8c917
Merged helper functions into perdictor's file.
Apr 19, 2024
fbe6212
Deleted feature extractor module
Apr 19, 2024
40cd1b1
Cleaned load model method, restart to use downloaded model.
Apr 19, 2024
1adc395
Removed unused files and cleaned the files.
Apr 19, 2024
625301a
Cleaned usless comments and refilled package description.
Apr 19, 2024
8cd17fd
Removed useless colour messages.
Apr 19, 2024
98bacaa
Brought aruco service package back.
Apr 19, 2024
b8c00f0
Removed useless keys from state machine.
Apr 19, 2024
a89b50c
changed log messages.
Apr 19, 2024
8e867d1
Fixed a stupid naming issue of feature extractor.
Apr 23, 2024
8c272cb
Update common/helpers/numpy2message/package.xml
MBTMBTMBT Apr 23, 2024
9bcd878
Update common/helpers/numpy2message/package.xml
MBTMBTMBT Apr 23, 2024
38b73ad
Update common/vision/lasr_vision_feature_extraction/package.xml
MBTMBTMBT Apr 23, 2024
a761bab
Canceled the default neck coordinates and leave it to be a failure.
Apr 23, 2024
8ec2fa0
Merge branch 'main' of https://github.com/MBTMBTMBT/LASR_ben
Apr 23, 2024
c1b15b9
Canceled the loop of getting mixed images, and renamed the keys.
Apr 23, 2024
9bffac0
renamed the function.
Apr 23, 2024
378579b
Update skills/src/lasr_skills/vision/get_image.py
MBTMBTMBT Apr 23, 2024
8f45600
Update skills/src/lasr_skills/vision/get_image.py
MBTMBTMBT Apr 23, 2024
9d73eb5
Update skills/src/lasr_skills/vision/image_msg_to_cv2.py
MBTMBTMBT Apr 23, 2024
a3f6db2
Update the new names in init.
Apr 23, 2024
c6f3a5d
removed a print and rename the imports.
Apr 23, 2024
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
202 changes: 0 additions & 202 deletions common/helpers/colour_estimation/CMakeLists.txt
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions common/helpers/colour_estimation/README.md
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions common/helpers/colour_estimation/doc/EXAMPLE.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion common/helpers/colour_estimation/doc/PREREQUISITES.md
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions common/helpers/colour_estimation/doc/USAGE.md
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions common/helpers/colour_estimation/setup.py
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions common/helpers/colour_estimation/src/colour_estimation/__init__.py
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions common/helpers/colour_estimation/src/colour_estimation/rgb.py
View file
Open in desktop

This file was deleted.

Loading
Loading