Skip to content
Snippets Groups Projects
Commit 1a3c44d0 authored by Your Name's avatar Your Name
Browse files

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 51ab2d53 a8a9f20b
No related branches found
No related tags found
1 merge request!135Resolve "Add Grasp (Affordance) Memory"
......@@ -208,7 +208,7 @@ namespace armarx::armem::articulated_object
return getRobotDescription(qResult.memory);
}
std::optional<robot::RobotState> Reader::queryState(const robot::RobotDescription& description,
std::optional<robot::RobotState> Reader::queryState(const std::string& instanceName,
const armem::Time& timestamp)
{
// TODO(fabian.reister): how to deal with multiple providers?
......@@ -220,7 +220,7 @@ namespace armarx::armem::articulated_object
qb
.coreSegments().withName(properties.coreInstanceSegmentName)
.providerSegments().all() // withName(properties.providerName) // agent
.entities().withName(description.name)
.entities().withName(instanceName)
.snapshots().latest();
// clang-format on
......
......@@ -52,7 +52,7 @@ namespace armarx::armem::articulated_object
ArticulatedObject get(const ArticulatedObjectDescription& description,
const armem::Time& timestamp) override;
std::optional<robot::RobotState> queryState(const robot::RobotDescription& description,
std::optional<robot::RobotState> queryState(const std::string &instanceName,
const armem::Time& timestamp);
std::optional<robot::RobotDescription> queryDescription(const std::string& name,
const armem::Time& timestamp);
......
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