From 41a378e88222cbc156729377114fe17769a72e68 Mon Sep 17 00:00:00 2001
From: Ann Katrin <a.seemann@fz-juelich.de>
Date: Thu, 17 Sep 2020 07:19:26 +0200
Subject: [PATCH] added sync when TrackPerson is first initialized
---
include/tracker.h | 2 ++
src/tracker.cpp | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/include/tracker.h b/include/tracker.h
index 19186de83..fefdf2cbe 100644
--- a/include/tracker.h
+++ b/include/tracker.h
@@ -207,6 +207,8 @@ public:
// TrackPerson(int nr, int frame, const Vec2F &p);
TrackPerson(int nr, int frame, const TrackPoint &p);
+ TrackPerson(int nr, int frame, const TrackPoint &p, int markerID);
+
bool insertAtFrame(int frame, const TrackPoint &p, int persNr, bool extrapolate);
inline int nrInBg() const
diff --git a/src/tracker.cpp b/src/tracker.cpp
index 340d22cae..1891c382d 100644
--- a/src/tracker.cpp
+++ b/src/tracker.cpp
@@ -133,6 +133,22 @@ TrackPerson::TrackPerson(int nr, int frame, const TrackPoint &p)
mNewReco(true),
mCol(p.color()),
mComment(),
+ mMarkerID(-1),
+ mColCount(1)
+{
+ append(p);
+}
+
+TrackPerson::TrackPerson(int nr, int frame, const TrackPoint &p, int markerID)
+ : mNr(0),
+ mHeight(MIN_HEIGHT),
+ mHeightCount(0),
+ mFirstFrame(frame),
+ mLastFrame(frame),
+ mNewReco(true),
+ mCol(p.color()),
+ mComment(),
+ mMarkerID(markerID),
mColCount(1)
{
append(p);
@@ -1091,7 +1107,8 @@ bool Tracker::addPoint(TrackPoint &p, int frame, QSet<int> onlyVisible, int *per
if (p.qual() > 100) //manual add
p.setQual(100);
- append(TrackPerson(/*p.markerID()>0 ? p.markerID() :*/ 0, frame, p)); // 0 is person number/markerID; newReco is set to true by default
+ append(TrackPerson(/*p.markerID()>0 ? p.markerID() :*/ 0, frame, p, p.getMarkerID())); // 0 is person number/markerID; newReco is set to true by default
+
}
if ((z > 0) && ((onlyVisible.empty()) || found))
(*this)[iNearest].setHeight(z, mMainWindow->getControlWidget()->coordAltitude->value()); // , frame
--
GitLab