From 10d01cf50e4c7874c53ce10be093bb70ac8e7fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Thu, 15 Aug 2019 14:07:52 +0200 Subject: [PATCH] replace origin frame pointer for origin capture pointer in CaptureIMU --- include/IMU/capture/capture_IMU.h | 4 ++-- include/IMU/processor/processor_IMU.h | 2 +- src/capture/capture_IMU.cpp | 8 ++++---- src/processor/processor_IMU.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/IMU/capture/capture_IMU.h b/include/IMU/capture/capture_IMU.h index 08257612c..513a2308b 100644 --- a/include/IMU/capture/capture_IMU.h +++ b/include/IMU/capture/capture_IMU.h @@ -17,14 +17,14 @@ class CaptureIMU : public CaptureMotion SensorBasePtr _sensor_ptr, const Eigen::Vector6s& _data, const Eigen::MatrixXs& _data_cov, - FrameBasePtr _origin_frame_ptr = nullptr); + CaptureBasePtr _origin_capture = nullptr); CaptureIMU(const TimeStamp& _init_ts, SensorBasePtr _sensor_ptr, const Eigen::Vector6s& _data, const Eigen::MatrixXs& _data_cov, const Vector6s& _bias, - FrameBasePtr _origin_frame_ptr = nullptr); + CaptureBasePtr _origin_capture = nullptr); virtual ~CaptureIMU(); diff --git a/include/IMU/processor/processor_IMU.h b/include/IMU/processor/processor_IMU.h index 59f87aa68..26db0958f 100644 --- a/include/IMU/processor/processor_IMU.h +++ b/include/IMU/processor/processor_IMU.h @@ -69,7 +69,7 @@ class ProcessorIMU : public ProcessorMotion{ const MatrixXs& _data_cov, const VectorXs& _calib, const VectorXs& _calib_preint, - const FrameBasePtr& _frame_origin) override; + const CaptureBasePtr& _capture_origin) override; virtual FeatureBasePtr emplaceFeature(CaptureMotionPtr _capture_motion) override; virtual FactorBasePtr emplaceFactor(FeatureBasePtr _feature_motion, CaptureBasePtr _capture_origin) override; diff --git a/src/capture/capture_IMU.cpp b/src/capture/capture_IMU.cpp index 5707723ae..fb624e57a 100644 --- a/src/capture/capture_IMU.cpp +++ b/src/capture/capture_IMU.cpp @@ -8,8 +8,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts, SensorBasePtr _sensor_ptr, const Eigen::Vector6s& _acc_gyro_data, const Eigen::MatrixXs& _data_cov, - FrameBasePtr _origin_frame_ptr) : - CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_frame_ptr, nullptr, nullptr, std::make_shared<StateBlock>(6, false)) + CaptureBasePtr _origin_capture) : + CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_capture, nullptr, nullptr, std::make_shared<StateBlock>(6, false)) { // } @@ -19,8 +19,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts, const Eigen::Vector6s& _acc_gyro_data, const Eigen::MatrixXs& _data_cov, const Vector6s& _bias, - FrameBasePtr _origin_frame_ptr) : - CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_frame_ptr, nullptr, nullptr, std::make_shared<StateBlock>(_bias, false)) + CaptureBasePtr _origin_capture) : + CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_capture, nullptr, nullptr, std::make_shared<StateBlock>(_bias, false)) { // } diff --git a/src/processor/processor_IMU.cpp b/src/processor/processor_IMU.cpp index 2d83320e7..afd12e449 100644 --- a/src/processor/processor_IMU.cpp +++ b/src/processor/processor_IMU.cpp @@ -65,14 +65,14 @@ CaptureMotionPtr ProcessorIMU::emplaceCapture(const FrameBasePtr& _frame_own, const MatrixXs& _data_cov, const VectorXs& _calib, const VectorXs& _calib_preint, - const FrameBasePtr& _frame_origin) + const CaptureBasePtr& _capture_origin) { auto cap_motion = std::static_pointer_cast<CaptureMotion>(CaptureBase::emplace<CaptureIMU>(_frame_own, _ts, _sensor, _data, _data_cov, - _frame_origin)); + _capture_origin)); cap_motion->setCalibration(_calib); cap_motion->setCalibrationPreint(_calib_preint); -- GitLab