Skip to content
Snippets Groups Projects
Commit cd26a0e7 authored by Tobias Arens's avatar Tobias Arens :100:
Browse files

move 'exportAutoCorrect' back to old location

parent 465fb903
No related branches found
No related tags found
1 merge request!221Resolve "Add export "direction of view" from ArucoMarkers"
Pipeline #75961 passed
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment