From c0f41f491d9c8f7bdb533a4af3a0dd7b2414f2df Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 10 Jun 2021 08:53:03 +0200
Subject: [PATCH] formatting files
---
.../armem_vision/client/laser_scans/Reader.cpp | 17 +++++++++--------
.../armem_vision/client/laser_scans/Reader.h | 7 ++++---
.../armem_vision/client/laser_scans/Writer.h | 5 ++---
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
index 286879b5f..84efcbcca 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
@@ -90,9 +90,10 @@ namespace armarx::armem::vision::laser_scans::client
memoryReader.setReadingMemory(result.proxy);
}
- armarx::armem::client::query::Builder Reader::buildQuery(const Query& query) const
+ armarx::armem::client::query::Builder
+ Reader::buildQuery(const Query& query) const
{
- armarx::armem::client::query::Builder qb;
+ armarx::armem::client::query::Builder qb;
ARMARX_INFO << "Query for agent: " << query.agent
<< " memory name: " << properties.memoryName;
@@ -132,15 +133,15 @@ namespace armarx::armem::vision::laser_scans::client
}
const auto convert =
- [](const arondto::LaserScanStamped& aronLaserScanStamped,
- const wm::EntityInstance& ei) -> LaserScanStamped
+ [](const arondto::LaserScanStamped & aronLaserScanStamped,
+ const wm::EntityInstance & ei) -> LaserScanStamped
{
LaserScanStamped laserScanStamped;
fromAron(aronLaserScanStamped, laserScanStamped);
const auto ndArrayNavigator =
- aron::datanavigator::NDArrayNavigator::DynamicCast(
- ei.data()->getElement("scan"));
+ aron::datanavigator::NDArrayNavigator::DynamicCast(
+ ei.data()->getElement("scan"));
ARMARX_CHECK_NOT_NULL(ndArrayNavigator);
@@ -202,8 +203,8 @@ namespace armarx::armem::vision::laser_scans::client
// now create result from memory
const auto& entities =
qResult.memory.getCoreSegment(properties.memoryName)
- .getProviderSegment(query.agent)
- .entities();
+ .getProviderSegment(query.agent)
+ .entities();
const auto laserScans = asLaserScans(entities);
const auto sensors = simox::alg::get_keys(entities);
diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
index f09e1e271..931fc1ef2 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
@@ -59,7 +59,7 @@ namespace armarx::armem::vision::laser_scans::client
*/
class Reader
{
- public:
+ public:
Reader(armem::ClientReaderComponentPluginUser& memoryClient);
virtual ~Reader();
@@ -96,9 +96,10 @@ namespace armarx::armem::vision::laser_scans::client
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
- armarx::armem::client::query::Builder buildQuery(const Query& query) const;
+ armarx::armem::client::query::Builder
+ buildQuery(const Query& query) const;
- private:
+ private:
armem::client::Reader memoryReader;
// Properties
diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
index 34edeb55d..6ae488dd5 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
@@ -44,7 +44,7 @@ namespace armarx::armem::vision::laser_scans::client
*/
class Writer
{
- public:
+ public:
Writer(armem::ClientWriterComponentPluginUser& component);
virtual ~Writer();
@@ -63,7 +63,7 @@ namespace armarx::armem::vision::laser_scans::client
const std::string& agentName,
const std::int64_t& timestamp);
- private:
+ private:
armem::client::Writer memoryWriter;
// Properties
@@ -73,7 +73,6 @@ namespace armarx::armem::vision::laser_scans::client
std::string coreSegmentName = "LaserScans";
} properties;
-
std::mutex memoryWriterMutex;
const std::string propertyPrefix = "mem.vision.";
--
GitLab