Skip to content
Snippets Groups Projects

Feature/kitchen open articulated objects

Merged Fabian Reister requested to merge feature/kitchen-open-articulated-objects into master
1 file
+ 9
11
Compare changes
  • Side-by-side
  • Inline
@@ -170,7 +170,6 @@ namespace armarx::armem::articulated_object
@@ -170,7 +170,6 @@ namespace armarx::armem::articulated_object
// Query all entities from provider.
// Query all entities from provider.
armem::client::query::Builder qb;
armem::client::query::Builder qb;
if (providerName.has_value()) // query single provider
if (providerName.has_value()) // query single provider
{
{
@@ -262,7 +261,7 @@ namespace armarx::armem::articulated_object
@@ -262,7 +261,7 @@ namespace armarx::armem::articulated_object
ARMARX_TRACE;
ARMARX_TRACE;
// Query all entities from provider.
// Query all entities from provider.
armem::client::query::Builder qb;
armem::client::query::Builder qb;
if (not providerName.has_value())
if (not providerName.has_value())
{
{
@@ -340,17 +339,16 @@ namespace armarx::armem::articulated_object
@@ -340,17 +339,16 @@ namespace armarx::armem::articulated_object
.getCoreSegment(objects::constants::CoreInstanceSegmentName);
.getCoreSegment(objects::constants::CoreInstanceSegmentName);
// clang-format on
// clang-format on
std::optional<wm::EntityInstance> instance;
try
coreSegment.forEachInstance([&instance](const wm::EntityInstance& i) { instance = i; });
if (instance.has_value())
{
{
return convertToRobotState(instance.value());
const wm::EntityInstance& instance = coreSegment.getLatestInstance();
// return robot::convertRobotState(instance.value());
return convertToRobotState(instance);
 
}
 
catch (...)
 
{
 
ARMARX_FATAL << "Failed to obtain robot state";
 
return std::nullopt;
}
}
ARMARX_FATAL << "Failed to obtain robot state";
return std::nullopt;
}
}
std::optional<robot::RobotDescription>
std::optional<robot::RobotDescription>
Loading