Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
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
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
cd26a0e7
Commit
cd26a0e7
authored
2 years ago
by
Tobias Arens
Browse files
Options
Downloads
Patches
Plain Diff
move 'exportAutoCorrect' back to old location
parent
465fb903
No related branches found
No related tags found
1 merge request
!221
Resolve "Add export "direction of view" from ArucoMarkers"
Pipeline
#75961
passed
2 years ago
Stage: pre-build-checks
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/trackerReal.cpp
+14
-8
14 additions, 8 deletions
src/trackerReal.cpp
with
14 additions
and
8 deletions
src/trackerReal.cpp
+
14
−
8
View file @
cd26a0e7
...
...
@@ -193,6 +193,7 @@ int TrackerReal::calculate(
const
auto
&
person
=
persons
[
i
];
addFrames
=
0
;
firstFrame
=
person
.
firstFrame
();
Vec2F
moveDir
(
0
,
0
);
// used for head direction
if
(
person
.
height
()
<
MIN_HEIGHT
+
1
)
{
...
...
@@ -293,17 +294,29 @@ int TrackerReal::calculate(
}
else
{
trackPersonReal
.
addEnd
(
Vec3F
(
pos
.
x
(),
pos
.
y
(),
bestZ
),
firstFrame
+
j
);
if
(
extrapolated
)
{
debout
<<
"Warning: no calculated height for trackpoint "
<<
j
<<
" (frame "
<<
person
.
firstFrame
()
+
j
<<
") of person "
<<
i
+
1
<<
", extrapolated height is used!"
<<
std
::
endl
;
}
if
(
exportAutoCorrect
)
{
moveDir
+=
reco
::
autoCorrectColorMarker
(
person
[
j
],
mMainWindow
->
getControlWidget
());
}
pos
=
imageItem
->
getPosReal
((
person
[
j
]
+
moveDir
+
br
).
toQPointF
(),
height
);
trackPersonReal
.
addEnd
(
Vec3F
(
pos
.
x
(),
pos
.
y
(),
bestZ
),
firstFrame
+
j
);
}
}
else
{
if
(
exportAutoCorrect
)
{
moveDir
+=
reco
::
autoCorrectColorMarker
(
person
[
j
],
mMainWindow
->
getControlWidget
());
}
pos
=
imageItem
->
getPosReal
((
person
[
j
]
+
moveDir
+
br
).
toQPointF
(),
height
);
trackPersonReal
.
addEnd
(
pos
,
firstFrame
+
j
);
if
(
exportAngleOfView
)
{
...
...
@@ -334,13 +347,6 @@ int TrackerReal::calculate(
{
// old implementation for expeortViewingDirection did not check for specific marker, so just use
// the else
Vec2F
moveDir
(
0
,
0
);
if
(
exportAutoCorrect
)
{
moveDir
+=
reco
::
autoCorrectColorMarker
(
person
[
j
],
mMainWindow
->
getControlWidget
());
}
pos
=
imageItem
->
getPosReal
((
person
[
j
]
+
moveDir
+
br
).
toQPointF
(),
height
);
// die frame nummer der animation wird TrackPoint der PersonReal mitgegeben,
// da Index groesser sein kann, da vorher frames hinzugefuegt wurden duch
// trackPersonReal.init(firstFrame+addFrames, height) oder aber innerhalb des trackink path
...
...
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