tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(device): add files getter/setter to device

Browse Source
This commit is contained in:
John Zhao
2019-01-09 16:51:28 +08:00
parent 292b8155b1
commit 242dc2b6fb
8 changed files with 119 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/writer/CMakeLists.txt
View File

@@ -20,10 +20,6 @@ set_outdir(
"${OUT_DIR}/bin/${DIR_NAME}"
)
include_directories(
${PRO_DIR}/src
)
## device_writer
add_library(device_writer STATIC device_writer.cc)

12
tools/writer/device_writer.cc
View File

@@ -18,7 +18,6 @@
#include <opencv2/core/core.hpp>
#include "mynteye/logger.h"
#include "mynteye/device/device.h"
#include "mynteye/util/files.h"
#define SAVE_LATEST_VERSION Version(1, 2)
@@ -36,15 +35,13 @@ DeviceWriter::~DeviceWriter() {
}
bool DeviceWriter::WriteDeviceInfo(const dev_info_t &info) {
auto &&channels = device_->channels();
// Update device info
auto &&dev_info = device_->GetInfo();
dev_info->lens_type = Type(info.lens_type);
dev_info->imu_type = Type(info.imu_type);
dev_info->nominal_baseline = info.nominal_baseline;
if (channels->SetFiles(dev_info.get(), nullptr, nullptr)) {
if (device_->SetFiles(dev_info.get(), nullptr, nullptr)) {
LOG(INFO) << "Write device info success";
LOG(INFO) << "Device info: {name: " << dev_info->name
<< ", serial_number: " << dev_info->serial_number
@@ -68,8 +65,6 @@ bool DeviceWriter::WriteDeviceInfo(const std::string &filepath) {
}
bool DeviceWriter::WriteImgParams(const img_params_map_t &img_params_map) {
auto &&channels = device_->channels();
img_params_map_t *img_params_new =
const_cast<img_params_map_t *>(&img_params_map);
// Update image params with raw
@@ -81,7 +76,7 @@ bool DeviceWriter::WriteImgParams(const img_params_map_t &img_params_map) {
}
}
if (channels->SetFiles(nullptr, img_params_new, nullptr)) {
if (device_->SetFiles(nullptr, img_params_new, nullptr)) {
LOG(INFO) << "Write img params success";
for (auto it = img_params_new->begin(); it != img_params_new->end(); it++) {
LOG(INFO) << "Resolution: {width: " << (*it).first.width
@@ -103,8 +98,7 @@ bool DeviceWriter::WriteImgParams(const std::string &filepath) {
}
bool DeviceWriter::WriteImuParams(const imu_params_t &params) {
auto &&channels = device_->channels();
if (channels->SetFiles(
if (device_->SetFiles(
nullptr, nullptr, const_cast<imu_params_t *>(&params))) {
LOG(INFO) << "Write imu params success";
LOG(INFO) << "Imu intrinsics accel: {" << params.in_accel << "}";

4
tools/writer/device_writer.h
View File

@@ -19,9 +19,7 @@
#include <memory>
#include <string>
#include "mynteye/mynteye.h"
#include "mynteye/device/channel/channels.h"
#include "mynteye/device/types.h"
#include "mynteye/device/device.h"
MYNTEYE_BEGIN_NAMESPACE