Skip to content
Snippets Groups Projects
Commit c0f41f49 authored by Fabian Reister's avatar Fabian Reister
Browse files

formatting files

parent 9ad30ea0
No related branches found
No related tags found
2 merge requests!170ArMem Viewer: Resolve Memory IDs,!164Feature/armem robot vision (previously armem_robot_mapping)
......@@ -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);
......
......@@ -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
......
......@@ -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.";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment