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

Merge branch 'feature/object-pose-client-object-poses-by-provider' into 'master'

ObjectPoseClientPluginUser::getObjectPosesByProvider

See merge request ArmarX/RobotAPI!217
parents 96a49a8e 961ed98c
No related branches found
No related tags found
1 merge request!217ObjectPoseClientPluginUser::getObjectPosesByProvider
......@@ -54,6 +54,17 @@ namespace armarx::objpose
}
return map;
}
ObjectPoseSeq ObjectPoseClient::fetchObjectPosesFromProvider(const std::string& providerName)
{
if (!objectPoseStorage)
{
ARMARX_WARNING << "No object pose observer.";
return {};
}
return fromIce(objectPoseStorage->getObjectPosesByProvider(providerName));
}
const ObjectPoseStorageInterfacePrx&
......@@ -70,4 +81,3 @@ namespace armarx::objpose
}
}
......@@ -27,9 +27,13 @@ namespace armarx::objpose
ObjectPoseSeq
fetchObjectPoses();
ObjectPoseMap
fetchObjectPosesAsMap();
ObjectPoseSeq
fetchObjectPosesFromProvider(const std::string& providerName);
const ObjectPoseStorageInterfacePrx&
getObjectPoseStorage() const;
......
......@@ -72,6 +72,12 @@ namespace armarx
return objpose::fromIce(objectPoseStorage->getObjectPoses());
}
objpose::ObjectPoseSeq ObjectPoseClientPluginUser::getObjectPosesByProvider(const std::string& providerName)
{
return objpose::ObjectPoseClient(objectPoseStorage, getObjectFinder()).fetchObjectPosesFromProvider(providerName);
}
plugins::ObjectPoseClientPlugin& ObjectPoseClientPluginUser::getObjectPoseClientPlugin()
{
return *plugin;
......@@ -86,4 +92,3 @@ namespace armarx
return plugin->getObjectFinder();
}
}
......@@ -79,6 +79,8 @@ namespace armarx
objpose::ObjectPoseSeq getObjectPoses();
objpose::ObjectPoseSeq getObjectPosesByProvider(const std::string& providerName);
plugins::ObjectPoseClientPlugin& getObjectPoseClientPlugin();
const plugins::ObjectPoseClientPlugin& getObjectPoseClientPlugin() const;
......
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