From 0f6da631229f202b84550b87af612152350c9460 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Thu, 22 Feb 2018 17:22:19 +0100
Subject: [PATCH] Rename kfCallback() to new version
---
src/processor_base.cpp | 2 +-
src/processor_base.h | 4 ++--
src/processor_tracker.cpp | 6 +++---
src/processor_tracker.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/processor_base.cpp b/src/processor_base.cpp
index a42bfab7e..fd8c518dd 100644
--- a/src/processor_base.cpp
+++ b/src/processor_base.cpp
@@ -45,7 +45,7 @@ FrameBasePtr ProcessorBase::emplaceFrame(FrameType _type, CaptureBasePtr _captur
return new_frame_ptr;
}
-void ProcessorBase::keyFrameCallbackNew(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other)
+void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other)
{
if (_keyframe_ptr != nullptr)
kf_pack_buffer_.add(_keyframe_ptr,_time_tol_other);
diff --git a/src/processor_base.h b/src/processor_base.h
index 03b811b61..997db66eb 100644
--- a/src/processor_base.h
+++ b/src/processor_base.h
@@ -162,9 +162,9 @@ class ProcessorBase : public NodeBase, public std::enable_shared_from_this<Proce
*/
FrameBasePtr emplaceFrame(FrameType _type, CaptureBasePtr _capture_ptr, const Eigen::VectorXs& _state);
- virtual bool keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tolerance) = 0;
+// virtual bool keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tolerance) = 0;
- void keyFrameCallbackNew(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other);
+ void keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other);
SensorBasePtr getSensorPtr();
const SensorBasePtr getSensorPtr() const;
diff --git a/src/processor_tracker.cpp b/src/processor_tracker.cpp
index 55992602c..cb485a1b6 100644
--- a/src/processor_tracker.cpp
+++ b/src/processor_tracker.cpp
@@ -346,9 +346,9 @@ void ProcessorTracker::process(CaptureBasePtr const _incoming_ptr)
//std::cout << "-----End of process():" << std::endl;
}
-bool ProcessorTracker::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other)
-{
- WOLF_TRACE("This callback doing nothing!!! ");
+//bool ProcessorTracker::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other)
+//{
+// WOLF_TRACE("This callback doing nothing!!! ");
// WOLF_DEBUG( "PT: KF" , _keyframe_ptr->id() , " callback received at ts= " , _keyframe_ptr->getTimeStamp().get() );
//
// assert((last_ptr_ == nullptr || last_ptr_->getFramePtr() != nullptr) && "ProcessorTracker::keyFrameCallback: last_ptr_ must have a frame always");
diff --git a/src/processor_tracker.h b/src/processor_tracker.h
index 00ba42583..d69da83d8 100644
--- a/src/processor_tracker.h
+++ b/src/processor_tracker.h
@@ -99,7 +99,7 @@ class ProcessorTracker : public ProcessorBase
void setMaxNewFeatures(const unsigned int& _max_new_features);
unsigned int getMaxNewFeatures();
- virtual bool keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other);
+// virtual bool keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other);
bool checkTimeTolerance(const TimeStamp& _ts1, const TimeStamp& _ts2);
bool checkTimeTolerance(const CaptureBasePtr _cap, const TimeStamp& _ts);
--
GitLab