From 68b194e56ff37d64a4d2c381b97850434dac5621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Sun, 5 Dec 2021 12:05:24 +0100
Subject: [PATCH] bring some tiny methods to header file
---
include/core/processor/processor_motion.h | 4 ++--
include/core/processor/processor_tracker.h | 8 ++++----
src/processor/processor_base.cpp | 6 +++---
src/processor/processor_motion.cpp | 9 ---------
src/processor/processor_tracker.cpp | 13 -------------
5 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/include/core/processor/processor_motion.h b/include/core/processor/processor_motion.h
index 643f19336..7a657aaae 100644
--- a/include/core/processor/processor_motion.h
+++ b/include/core/processor/processor_motion.h
@@ -258,13 +258,13 @@ class ProcessorMotion : public ProcessorBase, public MotionProvider
*
* Returns true if the key frame should be stored
*/
- bool storeKeyFrame(FrameBasePtr) override;
+ bool storeKeyFrame(FrameBasePtr) override { return true;}
/** \brief store capture
*
* Returns true if the capture should be stored
*/
- bool storeCapture(CaptureBasePtr) override;
+ bool storeCapture(CaptureBasePtr) override { return false;}
bool voteForKeyFrame() const override;
diff --git a/include/core/processor/processor_tracker.h b/include/core/processor/processor_tracker.h
index a3459c845..932b6d0ea 100644
--- a/include/core/processor/processor_tracker.h
+++ b/include/core/processor/processor_tracker.h
@@ -159,13 +159,13 @@ class ProcessorTracker : public ProcessorBase
*
* The ProcessorTracker only processes incoming captures (it is not called).
*/
- void processKeyFrame(FrameBasePtr _keyframe_ptr, const double& _time_tolerance) override {};
+ void processKeyFrame(FrameBasePtr _keyframe_ptr, const double& _time_tolerance) override {}
/** \brief trigger in capture
*
* Returns true if processCapture() should be called after the provided capture arrived.
*/
- bool triggerInCapture(CaptureBasePtr) const override;
+ bool triggerInCapture(CaptureBasePtr) const override { return true;}
/** \brief trigger in key-frame
*
@@ -177,13 +177,13 @@ class ProcessorTracker : public ProcessorBase
*
* Returns true if the key frame should be stored
*/
- bool storeKeyFrame(FrameBasePtr) override;
+ bool storeKeyFrame(FrameBasePtr) override { return true;}
/** \brief store capture
*
* Returns true if the capture should be stored
*/
- bool storeCapture(CaptureBasePtr) override;
+ bool storeCapture(CaptureBasePtr) override { return false;}
/** Pre-process incoming Capture
*
diff --git a/src/processor/processor_base.cpp b/src/processor/processor_base.cpp
index b3f1404cb..0e88a448e 100644
--- a/src/processor/processor_base.cpp
+++ b/src/processor/processor_base.cpp
@@ -63,11 +63,11 @@ void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const double& _
n_kf_callback_++;
startKFProfiling();
- // asking if key frame should be stored
+ // asking if frame should be stored
if (storeKeyFrame(_keyframe_ptr))
buffer_pack_kf_.add(_keyframe_ptr, _time_tol_other);
- // if trigger true -> processKeyFrame
+ // asking if frame should be processed
if (triggerInKeyFrame(_keyframe_ptr, _time_tol_other))
processKeyFrame(_keyframe_ptr, _time_tol_other);
@@ -92,7 +92,7 @@ void ProcessorBase::captureCallback(CaptureBasePtr _capture_ptr)
if (storeCapture(_capture_ptr))
buffer_capture_.add(_capture_ptr->getTimeStamp(), _capture_ptr);
- // if trigger, process directly without buffering
+ // asking if capture should be processed
if (triggerInCapture(_capture_ptr))
processCapture(_capture_ptr);
diff --git a/src/processor/processor_motion.cpp b/src/processor/processor_motion.cpp
index b0adf6d2b..6b9b4b031 100644
--- a/src/processor/processor_motion.cpp
+++ b/src/processor/processor_motion.cpp
@@ -999,15 +999,6 @@ PackKeyFramePtr ProcessorMotion::computeProcessingStep()
return nullptr;
}
-bool ProcessorMotion::storeKeyFrame(FrameBasePtr _frame_ptr)
-{
- return true;
-}
-bool ProcessorMotion::storeCapture(CaptureBasePtr _cap_ptr)
-{
- return false;
-}
-
TimeStamp ProcessorMotion::getTimeStamp ( ) const
{
if (not origin_ptr_ or
diff --git a/src/processor/processor_tracker.cpp b/src/processor/processor_tracker.cpp
index 03ff583b7..961937caf 100644
--- a/src/processor/processor_tracker.cpp
+++ b/src/processor/processor_tracker.cpp
@@ -315,19 +315,6 @@ void ProcessorTracker::computeProcessingStep()
}
}
-bool ProcessorTracker::triggerInCapture(CaptureBasePtr _cap_ptr) const
-{
- return true;
-}
-bool ProcessorTracker::storeKeyFrame(FrameBasePtr _frame_ptr)
-{
- return true;
-}
-bool ProcessorTracker::storeCapture(CaptureBasePtr _cap_ptr)
-{
- return false;
-}
-
void ProcessorTracker::printHeader(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const
{
_stream << _tabs << "PrcT" << id() << " " << getType() << " \"" << getName() << "\"" << std::endl;
--
GitLab