Commit Graph

313 Commits

Author SHA1 Message Date
Alexandre Naaim
338c95ea27
objp should not be objp_not_used (#91) 2024-04-09 10:04:18 +02:00
davidpagnon
e858dfd2cd choose ids of persons to display 2024-04-04 23:28:43 +02:00
davidpagnon
8075224879 replace nans by empty string in trc for OpenSim compatibility 2024-04-02 13:34:21 +02:00
Alexandre Naaim
71e05dd48d
Process non filtered data if there is no data filtered in folder (#86) 2024-04-02 11:15:48 +02:00
David PAGNON
19efec2723
Faster and more robust multi-person analysis (#85)
* tests synchro

* draft

* further draft

* affinity ok

* proposals okay, need to incorporate in Pose2Sim+tests

* will transfer sorting across frames in triangulation in next commit

* Lasts tests need to be done but seems to work pretty well

* should all work smoothly

* update readme

* last checks

* fixed linting issues

* getting tired of being forgetful
2024-03-31 01:40:38 +01:00
davidpagnon
2bb5bbbc4b a 2024-03-20 14:16:38 +01:00
davidpagnon
c4773faa68 draft synchro 2024-03-19 10:33:07 +01:00
davidpagnon
f4c764f3cb tests synchro 2024-03-16 15:49:40 +01:00
HunMinKim
5ddef52185
Synchronize multi cams based on keypoints speed. (#76) @rlagnsals
@rlagnsals 

* synchronization

* Auto Synchronization

* Auto Synchronization

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Auto Synchronization

* Update synchronize_cams.py

* Auto Synchronization

* Delete Pose2Sim/S00_Demo_Session/Config.toml

* Add files via upload

* Update Config.toml
2024-03-15 20:26:49 +01:00
David PAGNON
ce0abe1929
Faster computation 2024-03-15 10:49:32 +01:00
David PAGNON
ded436e9fe
Merge pull request #78 from ANaaim/minor_correction
Change of the testing of Calib and calib to work properly
2024-03-12 16:40:57 +01:00
davidpagnon
56f55674bf revert to model.predict(outputs) 2024-03-12 16:08:12 +01:00
David PAGNON
7d13dc4d38
test with older tensorflow version
tensorflow<=2.15.0
2024-03-12 15:46:08 +01:00
Anaaim
7e8a93f1a2 Change of the testing of Calib and calib to work properly 2024-03-12 08:39:12 +01:00
David PAGNON
864f89c433
Merge pull request #77 from rlagnsals/patch-1
sort by frame number.
2024-03-06 22:32:18 +01:00
davidpagnon
5347f22d49 alternative to multi-person if not satisfying 2024-03-06 22:26:10 +01:00
davidpagnon
eb80393304 forgot a param 2024-03-06 14:48:31 +01:00
davidpagnon
31ef4d775d small changes to person association 2024-03-06 14:11:56 +01:00
HunMinKim
23cc2119f1
sort by frame number.
Robust performance on long length frames.
2024-03-06 15:36:22 +09:00
davidpagnon
938f2f2ff8 time in hours, minutes, seconds 2024-03-06 00:15:21 +01:00
davidpagnon
c04df78697 added datetime to logs 2024-03-05 02:59:25 +01:00
davidpagnon
3ffd39fe17 fixed error when comparing lists with nana 2024-03-05 01:35:06 +01:00
davidpagnon
66df6bbd7c small improvements on multi-person detection 2024-03-04 18:46:56 +01:00
davidpagnon
757673d01c get augmenterDir from site-packages 2024-03-01 09:59:55 +01:00
davidpagnon
4b8bf88c6f decreased likelihood threshold since weighted triangulation 2024-03-01 03:59:06 +01:00
davidpagnon
f7021be051 save images with right ratio 2024-03-01 03:56:10 +01:00
David PAGNON
80802c9226
catch interpolation error 2024-02-29 12:55:32 +01:00
davidpagnon
cd5fe2852a All should be good. 2024-02-29 03:10:23 +01:00
davidpagnon
5eec8ab6c2 delete demo results 2024-02-28 16:44:46 +01:00
davidpagnon
a948c205cf multi-person analysis almost there 2024-02-28 16:28:09 +01:00
davidpagnon
fdd521674f unclamp hip and knee 2024-02-27 22:13:56 +01:00
davidpagnon
e9fc09bc2f output type needs to be specified 2024-02-27 21:43:02 +01:00
Anaaim
cfac8af647 Clear keras session to avoid time increase when doing batch processing 2024-02-27 17:41:03 +01:00
davidpagnon
9438152ae0 multi-person analysis is almost there 2024-02-27 13:48:30 +01:00
davidpagnon
cc27642468 biocv extension is now .calib 2024-02-27 11:36:56 +01:00
davidpagnon
05ffe7f36f multi-person frame of work works with single person 2024-02-26 18:13:39 +01:00
davidpagnon
6220c1baa1 fixed only one frame reprojected 2024-02-26 14:57:52 +01:00
davidpagnon
607865e3d4 beta: multi-person 2024-02-23 18:16:56 +01:00
David PAGNON
1f7b752232
Demo folder name change 2024-02-20 21:06:24 +01:00
davidpagnon
7b11028d4c Changed demo folder name 2024-02-20 21:02:34 +01:00
davidpagnon
1c2fc6d9d1 minor script changes 2024-02-20 17:21:47 +01:00
David PAGNON
ecd39ff943
Check for consistent camera number 2024-02-19 13:30:27 +01:00
David PAGNON
f9b236a6cd
Check for consistent camera number 2024-02-19 13:28:23 +01:00
David PAGNON
02e786e55b
typo 2024-02-19 13:26:54 +01:00
David PAGNON
128730a334
Check for consistent camera number 2024-02-19 13:13:33 +01:00
David PAGNON
57d009e4f6
BODY_25 Neck index error 2024-02-16 01:29:51 +01:00
davidpagnon
1f9a179758 DEMO -> Demo 2024-02-09 12:36:41 +01:00
David PAGNON
449ce87fb7
foolproofing broke something -> fixed 2024-02-09 12:18:57 +01:00
David PAGNON
02d2c5c56f
Update reproj_from_trc_calib.py 2024-02-09 00:47:39 +01:00
davidpagnon
6eeaef6445 change version 2024-02-05 17:49:10 +01:00
davidpagnon
f57f72522f Added videos and Blender add-on 2024-02-05 12:59:03 +01:00
davidpagnon
1548953bbc careless push had overwritten previous changes 2024-02-05 11:55:21 +01:00
davidpagnon
db145942de careless push had overwritten previous changes 2024-02-05 11:51:26 +01:00
davidpagnon
a4d38da980 Added videos and foolproofing stuff 2024-02-05 00:04:36 +01:00
davidpagnon
e4c68e1c72 start calib names at 0 2024-02-01 10:42:58 +01:00
davidpagnon
bd453fcb58 replace .dot by @ 2024-01-25 11:02:58 +01:00
davidpagnon
070692afaf change RT2qca function -> world_to_camera_persp 2024-01-25 10:53:28 +01:00
davidpagnon
c1ba8d324c typo in Config.toml 2024-01-25 09:51:12 +01:00
David PAGNON
cd5c565cab
Alphabetically sort calibration files to be converted 2024-01-24 17:21:04 +01:00
David PAGNON
63a3e3133d
Count cameras with likelihood< threshold as excluded 2024-01-24 13:15:56 +01:00
davidpagnon
07ec3e46c1 raise err if augment on model other than BODY_25/B 2024-01-19 22:18:16 +01:00
David PAGNON
c29abcc9d9
Merge pull request #63 from ANaaim/Correction_calibration
Correction in list comprehension to allow the second term to be consider
2024-01-19 21:03:56 +01:00
davidpagnon
5f75e29f20 LSTM review 2024-01-19 20:03:35 +01:00
davidpagnon
f24f1515f4 Merge branch 'draft' of https://github.com/perfanalytics/pose2sim into draft 2024-01-18 16:58:52 +01:00
Anaaim
0af7b2c1a4 Correction in list comprehension to allow the second term to be consider 2024-01-18 11:48:55 +01:00
HunMinKim
3db4541f4a
Update Pose2Sim.py
Delete import tensorflow when run triangulation
2024-01-18 09:28:37 +09:00
davidpagnon
c4de3d03a6 fullproof until limb swapping solved 2024-01-15 11:51:02 +01:00
Kim HunMin
966afd723c Separated augment 2024-01-15 09:39:33 +09:00
HunMinKim
736961d96e
Update Config.toml 2024-01-13 13:26:35 +09:00
Kim HunMin
c849648c6c ereged augmented to triangulation 2024-01-13 13:23:09 +09:00
Kim HunMin
0dfc7ea705 erged augmented to triangulation 2024-01-13 13:15:09 +09:00
Kim HunMin
a601c3eac2 Update AUGMENTED 2024-01-12 11:15:27 +09:00
HunMinKim
0680c12b75
Create .gitkeep 2024-01-11 09:37:07 +09:00
HunMinKim
bc69407829
Delete Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S00_P00_OpenSim directory 2024-01-11 09:35:24 +09:00
HunMinKim
44fe35325a
OpenSim folder 2024-01-11 09:34:26 +09:00
HunMinKim
5b7954e250
Delete Pose2Sim/Demo/OpenSim_Setup/LSTM/None 2024-01-11 09:19:41 +09:00
HunMinKim
e70e7d86ff
Add opensimpipeline for augmenter 2024-01-11 09:12:56 +09:00
HunMinKim
84ffba0dab
Create None 2024-01-11 09:09:49 +09:00
HunMinKim
5e9490bbf6
Create blank 2024-01-09 20:37:11 +09:00
HunMinKim
5df57889f1
Create blank 2024-01-09 20:36:51 +09:00
HunMinKim
d57011d7c5
Delete Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T01_MotionTrial1/pose 2024-01-09 20:36:07 +09:00
HunMinKim
c8489b6136
Create pose 2024-01-09 20:35:55 +09:00
HunMinKim
77aa1f8af3
Update Augmenter 2024-01-09 20:35:02 +09:00
HunMinKim
5946e13d8d
Delete Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0 directory 2024-01-09 20:34:24 +09:00
HunMinKim
928083f8b3
Add files via upload 2024-01-09 20:33:54 +09:00
HunMinKim
1746e39b35
Delete Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0 directory 2024-01-09 20:33:33 +09:00
HunMinKim
3d201d2d44
Delete Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1 directory 2024-01-09 20:33:26 +09:00
HunMinKim
f97c3911d2
Update Augmenter.toml 2024-01-09 20:32:35 +09:00
HunMinKim
cbed3c157a
Update Augmenter 2024-01-09 20:32:07 +09:00
HunMinKim
4346e0e001
Update Pose2Sim.py
Update augmenter
2024-01-09 20:30:06 +09:00
HunMinKim
90cb9c9142
Update Augmenter 2024-01-09 20:15:12 +09:00
HunMinKim
6d2013efee
Update Augmenter 2024-01-09 20:12:55 +09:00
HunMinKim
380f514851
Update Augmenter 2024-01-09 20:11:00 +09:00
HunMinKim
9fe0b713e4
Update Config.toml 2024-01-09 20:10:05 +09:00
HunMinKim
0b504a77e1
Update Config.toml
Add [BODY_25_AUGMENTED]
2024-01-09 20:09:11 +09:00
HunMinKim
10cd38eafb
Add MarkerAugmenter 2024-01-09 20:07:13 +09:00
HunMinKim
c36d93c0fd
Add MarkerAugmenter 2024-01-09 20:05:51 +09:00
HunMinKim
efe9ac9107
Delete Pose2Sim/Demo/S00_Demo_Session/MarkerAugmenter directory 2024-01-09 20:04:58 +09:00
HunMinKim
58b89d57dd
Add files via upload 2024-01-09 20:04:26 +09:00
HunMinKim
4d5fb5dcbc
Create git 2024-01-09 20:03:24 +09:00
HunMinKim
53d1d1e38e
Delete Pose2Sim/Demo/S00_Demo_Session/MarkerAugmenter/LSTM directory 2024-01-09 20:00:01 +09:00
HunMinKim
b7e1efee8b
Add MarkerAugmenter 2024-01-09 19:58:35 +09:00
HunMinKim
10f3b5cd4d
Delete Pose2Sim/Demo/S00_Demo_Session/MarkerAugmenter 2024-01-09 19:57:36 +09:00
HunMinKim
aa726806bc
Create MarkerAugmenter 2024-01-09 19:57:15 +09:00
davidpagnon
fe0a3e66c2 fixed "The requested array has an inhomogeneous shape" 2024-01-08 14:48:19 +01:00
davidpagnon
4ce2cdbcfd Add OpenSim folders 2024-01-08 14:16:21 +01:00
davidpagnon
57eef5f0c4 undistort to false by default 2024-01-08 13:01:39 +01:00
davidpagnon
6f26819827 works in cases where almost all cameras are bad - still disto to be tested 2024-01-05 16:37:41 +01:00
davidpagnon
778b880bad all finally works - last tests still to be run 2024-01-05 14:32:55 +01:00
davidpagnon
71648bf051 typo 2024-01-05 11:05:39 +01:00
davidpagnon
5ef5bd1441 typo 2024-01-05 10:43:17 +01:00
davidpagnon
a4f327b13f mostly fixed - last tests to run 2024-01-05 10:33:37 +01:00
davidpagnon
f356f16076 nightly commit. Excluded cameras correctly calculated 2024-01-05 04:22:51 +01:00
davidpagnon
d6b991cf3a nightly commit: cam excluded correctly calculated 2024-01-05 04:20:12 +01:00
davidpagnon
5bee7bf425 wrong copy-paste 2024-01-04 17:20:06 +01:00
davidpagnon
9f8f40d413 undistortion applied to calibration and personAssociation too 2024-01-04 14:19:08 +01:00
davidpagnon
ec650276b4 typo 2024-01-03 09:13:11 +01:00
davidpagnon
47bbb17d0c fix lens distortion correction. Still to be fully tested 2024-01-03 03:58:10 +01:00
davidpagnon
76c39fcafd should work on cameras with distortions; still needs to be fully tested 2024-01-02 20:15:43 +01:00
davidpagnon
5b76c2ca1d typo 2024-01-01 04:23:11 +01:00
davidpagnon
b2046530d5 handle limb swapping 2024-01-01 03:51:31 +01:00
davidpagnon
294914bc3a limb swapping should work but still commented bc not fully tested 2023-12-28 23:08:50 +01:00
davidpagnon
4431b1aef1 make_c3d in config 2023-12-23 12:09:09 +01:00
David PAGNON
4167e672f9
extrinsic calibration recap fix 2023-12-19 18:00:01 +01:00
davidpagnon
2df2a3ce94 Retrieve accidentally removed opensim setup files 2023-12-17 21:16:32 +01:00
davidpagnon
19d27ab74e hopefully works on all platforms now 2023-12-17 21:03:01 +01:00
davidpagnon
efb475660e retest 2023-12-17 20:39:28 +01:00
davidpagnon
38f1f83f09 test.py 2023-12-17 20:26:18 +01:00
davidpagnon
f06d385d57 raw string in test.py 2023-12-17 20:15:22 +01:00
davidpagnon
f446c3b61f comment unused functions 2023-12-17 20:08:34 +01:00
davidpagnon
cc25269920 Merge branch 'draft' 2023-12-17 20:04:18 +01:00
davidpagnon
500402ca19 ready to merge v0.5 2023-12-17 19:57:57 +01:00
davidpagnon
dde50b4f83 opensim okay 2023-12-17 17:24:09 +01:00
davidpagnon
f3b0184920 setup opensim 2023-12-17 16:02:00 +01:00
davidpagnon
b157210bb5 empty session in demo 2023-12-17 14:46:08 +01:00
davidpagnon
bea4835d66 test okay 2023-12-17 14:29:22 +01:00
davidpagnon
442533f661 filtering fixed 2023-12-16 22:19:58 +01:00
davidpagnon
37354e2598 batch processing works but someth strange in filt 2023-12-16 22:15:12 +01:00
davidpagnon
2e6700e747 undistort draft 2023-12-16 19:17:36 +01:00
David PAGNON
2222a99fa6
Draft for undistortion 2023-12-15 15:11:26 +01:00
davidpagnon
843be8324b shifted Coco133 numbers 2023-12-14 22:48:49 +01:00
David PAGNON
66401f211b
Fixed keypoint order in COC_133 2023-12-14 22:45:29 +01:00
davidpagnon
d15bbb6b08 correct static pose 2023-12-13 15:25:53 +01:00
davidpagnon
2977b9bfc9 fix fps 2023-12-13 15:17:07 +01:00
davidpagnon
29d02df4cf reproj tested 2023-12-12 18:44:35 +01:00
David PAGNON
5f25d25f8f
Reproject points in openpose or deeplabcut format 2023-12-12 18:42:26 +01:00
davidpagnon
59d30f917c to be cleaned but works 2023-12-12 18:02:54 +01:00
davidpagnon
9dff5d73be config can be dict, dir, None (from current dir) 2023-12-09 22:06:57 +01:00
davidpagnon
f23f82c6eb bla 2023-12-09 12:53:43 +01:00
davidpagnon
167cd52f37 calibration ok 2023-12-08 11:21:48 +01:00