From 62eb8e94056a7b610354f145297613771e437ab6 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Fri, 23 Feb 2018 14:44:45 +0100
Subject: [PATCH] Make updateDt() return the dt_
---
src/processor_motion.cpp | 2 +-
src/processor_motion.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/processor_motion.cpp b/src/processor_motion.cpp
index 8cdbd2c1d..0c1d4b4d0 100644
--- a/src/processor_motion.cpp
+++ b/src/processor_motion.cpp
@@ -431,7 +431,7 @@ bool ProcessorMotion::keyFrameCallback(FrameBasePtr _new_keyframe, const Scalar&
void ProcessorMotion::integrateOneStep()
{
// Set dt
- updateDt();
+ dt_ = updateDt();
// get vector of parameters to calibrate
calib_ = getBuffer().getCalibrationPreint();
diff --git a/src/processor_motion.h b/src/processor_motion.h
index 89ecfd070..d2c211d2f 100644
--- a/src/processor_motion.h
+++ b/src/processor_motion.h
@@ -205,7 +205,7 @@ class ProcessorMotion : public ProcessorBase
// Helper functions:
protected:
- void updateDt();
+ Scalar updateDt();
void integrateOneStep();
void splitBuffer(const TimeStamp& _t_split, MotionBuffer& _oldest_part);
void reintegrateBuffer(CaptureMotionPtr _capture_ptr);
@@ -516,9 +516,9 @@ inline bool ProcessorMotion::isMotion()
return true;
}
-inline void ProcessorMotion::updateDt()
+inline Scalar ProcessorMotion::updateDt()
{
- dt_ = incoming_ptr_->getTimeStamp() - getBuffer().get().back().ts_;
+ return dt_ = incoming_ptr_->getTimeStamp() - getBuffer().get().back().ts_;
}
inline const MotionBuffer& ProcessorMotion::getBuffer() const
--
GitLab