From 6d54409bc2f3c3a4e76100b7f1379b9d6952f652 Mon Sep 17 00:00:00 2001 From: davidpagnon Date: Thu, 29 Sep 2022 18:07:53 +0200 Subject: [PATCH] change openpose_model to pose_model --- Pose2Sim/Demo/User/Config.toml | 2 +- Pose2Sim/Demo/User/test.toml | 2 +- Pose2Sim/Empty_project/User/Config.toml | 2 +- Pose2Sim/track_2d.py | 4 ++-- Pose2Sim/triangulate_3d.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Pose2Sim/Demo/User/Config.toml b/Pose2Sim/Demo/User/Config.toml index 9e513e8..aa7b441 100644 --- a/Pose2Sim/Demo/User/Config.toml +++ b/Pose2Sim/Demo/User/Config.toml @@ -19,7 +19,7 @@ pose3d_folder_name = 'pose-3d' opensim_folder_name = 'opensim' [pose-2d] -openpose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. +pose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. # set your own model in skeleton.py if you don't use openpose. [calibration] diff --git a/Pose2Sim/Demo/User/test.toml b/Pose2Sim/Demo/User/test.toml index 8e85e75..9b4fd6d 100644 --- a/Pose2Sim/Demo/User/test.toml +++ b/Pose2Sim/Demo/User/test.toml @@ -19,7 +19,7 @@ pose3d_folder_name = 'pose-3d' opensim_folder_name = 'opensim' [pose-2d] -openpose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. +pose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. # set your own model in skeleton.py if you don't use openpose. [calibration] diff --git a/Pose2Sim/Empty_project/User/Config.toml b/Pose2Sim/Empty_project/User/Config.toml index 9e513e8..aa7b441 100644 --- a/Pose2Sim/Empty_project/User/Config.toml +++ b/Pose2Sim/Empty_project/User/Config.toml @@ -19,7 +19,7 @@ pose3d_folder_name = 'pose-3d' opensim_folder_name = 'opensim' [pose-2d] -openpose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. +pose_model = 'BODY_25B' #BODY_25B, BODY_25, COCO, MPI are available. # set your own model in skeleton.py if you don't use openpose. [calibration] diff --git a/Pose2Sim/track_2d.py b/Pose2Sim/track_2d.py index 368dda4..d8c5fb8 100644 --- a/Pose2Sim/track_2d.py +++ b/Pose2Sim/track_2d.py @@ -244,7 +244,7 @@ def track_2d_all(config): calib_folder_name = config.get('project').get('calib_folder_name') poseTracked_folder_name = config.get('project').get('poseTracked_folder_name') pose_folder_name = config.get('project').get('pose_folder_name') - openpose_model = config.get('pose-2d').get('openpose_model') + pose_model = config.get('pose-2d').get('pose_model') tracked_keypoint = config.get('2d-tracking').get('tracked_keypoint') json_folder_extension = config.get('project').get('pose_json_folder_extension') frames_range = config.get('project').get('frames_range') @@ -258,7 +258,7 @@ def track_2d_all(config): P = computeP(calib_file) # selection of tracked keypoint id - model = eval(openpose_model) + model = eval(pose_model) tracked_keypoint_id = [node.id for _, _, node in RenderTree(model) if node.name==tracked_keypoint][0] # 2d-pose files selection diff --git a/Pose2Sim/triangulate_3d.py b/Pose2Sim/triangulate_3d.py index 0d53887..ba3a07f 100644 --- a/Pose2Sim/triangulate_3d.py +++ b/Pose2Sim/triangulate_3d.py @@ -359,7 +359,7 @@ def triangulate_all(config): project_dir = config.get('project').get('project_dir') if project_dir == '': project_dir = os.getcwd() calib_folder_name = config.get('project').get('calib_folder_name') - openpose_model = config.get('pose-2d').get('openpose_model') + pose_model = config.get('pose-2d').get('pose_model') pose_folder_name = config.get('project').get('pose_folder_name') json_folder_extension = config.get('project').get('pose_json_folder_extension') frames_range = config.get('project').get('frames_range') @@ -375,7 +375,7 @@ def triangulate_all(config): P = computeP(calib_file) # Retrieve keypoints from model - model = eval(openpose_model) + model = eval(pose_model) keypoints_ids = [node.id for _, _, node in RenderTree(model) if node.id!=None] keypoints_names = [node.name for _, _, node in RenderTree(model) if node.id!=None] keypoints_idx = list(range(len(keypoints_ids)))