Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Skills
Navigation
Commits
e06e5238
Commit
e06e5238
authored
2 years ago
by
Tobias Gröger
Browse files
Options
Downloads
Patches
Plain Diff
Fix Head kexpoint name
parent
a41c0b8c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!68
Add human tracking
,
!28
Draft: Dev -> Main
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/armarx/navigation/human/HumanTracker.cpp
+3
-3
3 additions, 3 deletions
source/armarx/navigation/human/HumanTracker.cpp
source/armarx/navigation/human/HumanTracker.h
+1
-1
1 addition, 1 deletion
source/armarx/navigation/human/HumanTracker.h
with
4 additions
and
4 deletions
source/armarx/navigation/human/HumanTracker.cpp
+
3
−
3
View file @
e06e5238
...
...
@@ -182,10 +182,10 @@ namespace armarx::navigation::human
// calculate the yaw of the specified keypoint representing the orientation if it exists
double
yaw
=
0
;
if
(
humanPose
.
keypoints
.
count
(
parameters
.
rotationKeypoint
)
>
0
)
auto
head
=
humanPose
.
keypoints
.
find
(
parameters
.
rotationKeypoint
);
if
(
head
!=
humanPose
.
keypoints
.
end
())
{
const
armem
::
human
::
PoseKeypoint
&
refKeypoint
=
humanPose
.
keypoints
.
at
(
parameters
.
rotationKeypoint
);
const
armem
::
human
::
PoseKeypoint
&
refKeypoint
=
head
->
second
;
ARMARX_CHECK
(
refKeypoint
.
orientationGlobal
.
has_value
());
Eigen
::
Quaternionf
qhead
=
refKeypoint
.
orientationGlobal
->
toEigenQuaternion
();
Eigen
::
Vector3f
vec
(
1
,
0
,
0
);
...
...
This diff is collapsed.
Click to expand it.
source/armarx/navigation/human/HumanTracker.h
+
1
−
1
View file @
e06e5238
...
...
@@ -102,7 +102,7 @@ namespace armarx::navigation::human
struct
Parameters
{
// the keypoint which should be used for calculating the rotation of the humans
const
std
::
string
rotationKeypoint
=
"H
EAD
"
;
const
std
::
string
rotationKeypoint
=
"H
ead
"
;
// the duration after which tracked humans will be erased if no new measurement for
// this human is found
Duration
maxTrackingAge
=
Duration
::
MilliSeconds
(
500
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment