From 04aa48b510a5bbb57a97864155f2827275335d74 Mon Sep 17 00:00:00 2001 From: Thiago Santini Date: Thu, 17 Jan 2019 17:10:34 +0100 Subject: [PATCH] Sets empty processing timestamp to -1 to avoid poluting the Journal --- EyeRecToo/src/Synchronizer.cpp | 4 ++-- EyeRecToo/src/gaze-estimation/GazeEstimationMethod.h | 2 +- EyeRecToo/src/pupil-tracking/PupilTrackingMethod.h | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/EyeRecToo/src/Synchronizer.cpp b/EyeRecToo/src/Synchronizer.cpp index 6ec735d..b6a8938 100644 --- a/EyeRecToo/src/Synchronizer.cpp +++ b/EyeRecToo/src/Synchronizer.cpp @@ -21,8 +21,8 @@ Synchronizer::Synchronizer(QObject* parent) this, SLOT(synchronize())); timer->start(userSynchronizeMs); } - emptyEyeData.timestamp = -1; - emptyFieldData.timestamp = -1; + emptyEyeData.timestamp = emptyEyeData.processingTimestamp = -1; + emptyFieldData.timestamp = emptyFieldData.processingTimestamp = -1; } template diff --git a/EyeRecToo/src/gaze-estimation/GazeEstimationMethod.h b/EyeRecToo/src/gaze-estimation/GazeEstimationMethod.h index 2f340c6..9899d1a 100644 --- a/EyeRecToo/src/gaze-estimation/GazeEstimationMethod.h +++ b/EyeRecToo/src/gaze-estimation/GazeEstimationMethod.h @@ -18,7 +18,7 @@ public: : minPupilConfidence(0.66f) { } - virtual ~GazeEstimationMethod() {} + virtual ~GazeEstimationMethod() = default; enum InputType { BINOCULAR = 1, diff --git a/EyeRecToo/src/pupil-tracking/PupilTrackingMethod.h b/EyeRecToo/src/pupil-tracking/PupilTrackingMethod.h index 563c7ad..e00a930 100644 --- a/EyeRecToo/src/pupil-tracking/PupilTrackingMethod.h +++ b/EyeRecToo/src/pupil-tracking/PupilTrackingMethod.h @@ -21,8 +21,7 @@ public: } TrackedPupil() - : Pupil() - , ts(0) + : TrackedPupil(0, Pupil()) { } @@ -31,7 +30,7 @@ public: class PupilTrackingMethod { public: - virtual ~PupilTrackingMethod() {} + virtual ~PupilTrackingMethod() = default; // Tracking and detection logic virtual void detectAndTrack(const Timestamp& ts, const cv::Mat& frame, const cv::Rect& roi, Pupil& pupil, std::shared_ptr pupilDetectionMethod = nullptr, const float& minPupilDiameterPx = -1, const float& maxPupilDiameterPx = -1); -- GitLab