Cleaned and remade feature extraction.#159

Merged

jws-1 merged 103 commits intoLASR-at-Home:mainfrom MBTMBTMBT:main

Apr 23, 2024

+821-962

Commits on Dec 5, 2023

testtesttest
Benteng Ma
committed
Test
Benteng Ma
committed
Test
Benteng Ma
committed

Commits on Dec 6, 2023

Message Change
Benteng Ma
committed
Merge pull request #1 from MBTMBTMBT/12_6
MBTMBTMBT
authored

Commits on Dec 7, 2023

fixed message writting and reading
Benteng Ma
committed
fixed image crop
Benteng Ma
committed
Updated the feature extraction node and changed the messages.
Benteng Ma
committed
Merge pull request #2 from MBTMBTMBT/12_6
MBTMBTMBT
authored

Commits on Dec 8, 2023

fixed that torsal and head frames were inversed.
Benteng Ma
committed
Merge pull request #3 from MBTMBTMBT/12_6
MBTMBTMBT
authored
Changed colour format from BGR to RGB within the detection process.
Benteng Ma
committed
keep the saved model
Benteng Ma
committed
keep the model file
Benteng Ma
committed
keep the saved model
Benteng Ma
committed
Cancel saving the images (but sitll cannot see use cv2.imshow)
Benteng Ma
committed

Commits on Dec 11, 2023

Runnable demo
Benteng Ma
committed

Commits on Dec 13, 2023

added the hair colour distribution matching method
Benteng Ma
committed

Commits on Dec 14, 2023

retrained model is very robust so changed the threshold
Benteng Ma
committed

Commits on Jan 31, 2024

Moving the head to meet the person.
Benteng Ma
committed

Commits on Feb 2, 2024

xyz axis readable.
Benteng Ma
committed

Commits on Feb 5, 2024

(Hopefully) Runnable with 3d input.
Benteng Ma
committed
Speak normally.
Benteng Ma
committed
Try to move the head.
Benteng Ma
committed
testtesttest

Benteng Ma
authored and
tiago
committed
Test

Benteng Ma
authored and
tiago
committed
Test

Benteng Ma
authored and
tiago
committed
Message Change

Benteng Ma
authored and
tiago
committed
fixed message writting and reading

Benteng Ma
authored and
tiago
committed
fixed image crop

Benteng Ma
authored and
tiago
committed
Updated the feature extraction node and changed the messages.

Benteng Ma
authored and
tiago
committed
fixed that torsal and head frames were inversed.

Benteng Ma
authored and
tiago
committed
Changed colour format from BGR to RGB within the detection process.

Benteng Ma
authored and
tiago
committed
keep the saved model

Benteng Ma
authored and
tiago
committed
keep the model file

Benteng Ma
authored and
tiago
committed
keep the saved model

Benteng Ma
authored and
tiago
committed
Cancel saving the images (but sitll cannot see use cv2.imshow)

Benteng Ma
authored and
tiago
committed
Runnable demo

Benteng Ma
authored and
tiago
committed
added the hair colour distribution matching method

Benteng Ma
authored and
tiago
committed
retrained model is very robust so changed the threshold

Benteng Ma
authored and
tiago
committed
Moving the head to meet the person.

Benteng Ma
authored and
tiago
committed
xyz axis readable.

Benteng Ma
authored and
tiago
committed
(Hopefully) Runnable with 3d input.

Benteng Ma
authored and
tiago
committed
ah
tiago
committed

Commits on Feb 8, 2024

At least the head moves, not looking at me though.
Benteng Ma
committed

Commits on Feb 18, 2024

Merge branch 'LASR-at-Home:main' into main
MBTMBTMBT
authored

Commits on Feb 23, 2024

Cleaned the file to have only one model appear.
Benteng Ma
committed
Replace the old model with the new one.
Benteng Ma
committed
merging
tiago
committed
correct the lost module.
Benteng Ma
committed
info update
Benteng Ma
committed
fixed issues in the service
Benteng Ma
committed
fixed a stupic typo
Benteng Ma
committed
runnable version for full demo
Benteng Ma
committed
Merge branch 'main' into update-model
MBTMBTMBT
authored
Merge pull request #4 from MBTMBTMBT/update-model
MBTMBTMBT
authored
Recover the state machine for demo.
Benteng Ma
committed

Commits on Feb 27, 2024

Added a simple loop to refresh the frame taken, should work fine.
Benteng Ma
committed

Commits on Mar 11, 2024

Cleaned some commented code.
Benteng Ma
committed
removed loading the pretrained parameters
Benteng Ma
committed
removed load pretrained parameter.
Benteng Ma
committed
renamed torch_module into feature_extractor (Recompile needed!!!)
Benteng Ma
committed
renamed torch_module into feature_extractor
Benteng Ma
committed
renamed lasr_vision_torch to lasr_vision_feature_extraction
Benteng Ma
committed
removed some unused code comments
Benteng Ma
committed
removed colour estimation module
Benteng Ma
committed
removed colour_estimation dependence
Benteng Ma
committed
cleaned usused comments
Benteng Ma
committed
cleaned comments
Benteng Ma
committed
renamed torch_module to feature_extractor
Benteng Ma
committed
removed unused import, launch file and functions.
Benteng Ma
committed
reset <arg name="whisper_device_param" default="9" />
Benteng Ma
committed

Commits on Mar 22, 2024

Remade to achieve easier bodipix model loading
Benteng Ma
committed
added a break in the loop
Benteng Ma
committed

Commits on Apr 17, 2024

I don't really understand why this is in my branch, please ignore this commit when merge.
Benteng Ma
committed
Replace string return with json string return.
Benteng Ma
committed

Commits on Apr 18, 2024

Merge pull request #5 from MBTMBTMBT/repository-clean-mar11
MBTMBTMBT
authored
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
pcl functioned remoeved because appeared repetitively.
Benteng Ma
committed
replaced the model and predictor initialization, put "__main__"
Benteng Ma
committed

Commits on Apr 19, 2024

Merged model classes file into predictor's file
Benteng Ma
committed
Merged helper functions into perdictor's file.
Benteng Ma
committed
Deleted feature extractor module
Benteng Ma
committed
Cleaned load model method, restart to use downloaded model.
Benteng Ma
committed
Removed unused files and cleaned the files.
Benteng Ma
committed
Cleaned usless comments and refilled package description.
Benteng Ma
committed
Removed useless colour messages.
Benteng Ma
committed
Brought aruco service package back.
Benteng Ma
committed
Removed useless keys from state machine.
Benteng Ma
committed
changed log messages.
Benteng Ma
committed

Commits on Apr 23, 2024

Fixed a stupid naming issue of feature extractor.
Benteng Ma
committed
Update common/helpers/numpy2message/package.xml

MBTMBTMBT
and
jws-1
authored
Update common/helpers/numpy2message/package.xml

MBTMBTMBT
and
jws-1
authored
Update common/vision/lasr_vision_feature_extraction/package.xml

MBTMBTMBT
and
jws-1
authored
Canceled the default neck coordinates and leave it to be a failure.
Benteng Ma
committed
Merge branch 'main' of https://github.com/MBTMBTMBT/LASR_ben
Benteng Ma
committed
Canceled the loop of getting mixed images, and renamed the keys.
Benteng Ma
committed
renamed the function.
Benteng Ma
committed
Update skills/src/lasr_skills/vision/get_image.py

MBTMBTMBT
and
jws-1
authored
Update skills/src/lasr_skills/vision/get_image.py

MBTMBTMBT
and
jws-1
authored
Update skills/src/lasr_skills/vision/image_msg_to_cv2.py

MBTMBTMBT
and
jws-1
authored
Update the new names in init.
Benteng Ma
committed
removed a print and rename the imports.
Benteng Ma
committed