Skip to content
Snippets Groups Projects
Commit 5a778d9e authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Fix includes

parent ee699a47
No related branches found
No related tags found
2 merge requests!192Fix bugs in ArMem and make disk loading and storing nicer,!188ArMem Updates
......@@ -20,8 +20,6 @@
*/
#include "TransformReader.h"
#include "RobotAPI/libraries/armem/core/Time.h"
#include "RobotAPI/libraries/armem_robot_state/common/localization/types.h"
#include <algorithm>
#include <iterator>
......@@ -45,20 +43,23 @@
#include <ArmarXCore/core/time/CycleUtil.h>
// this package
#include <RobotAPI/libraries/core/FramedPose.h>
#include <RobotAPI/libraries/armem/client/query/Builder.h>
#include <RobotAPI/libraries/armem/client/query/query_fns.h>
#include <RobotAPI/libraries/armem/core/Time.h>
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
#include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
#include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
#include <RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.h>
#include <RobotAPI/libraries/core/FramedPose.h>
#include <RobotAPI/libraries/armem_robot_state/aron_conversions.h>
#include <RobotAPI/libraries/armem_robot_state/aron/Transform.aron.generated.h>
#include <RobotAPI/libraries/armem_robot_state/common/localization/types.h>
#include <RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.h>
namespace armarx::armem::client::robot_state::localization
{
......@@ -135,11 +136,11 @@ namespace armarx::armem::client::robot_state::localization
TransformResult TransformReader::lookupTransform(const TransformQuery& query) const
{
const auto& timestamp = query.header.timestamp;
const auto durationEpsilon = IceUtil::Time::milliSeconds(-1);
ARMARX_DEBUG << "Looking up transform at timestamp " << timestamp;
const IceUtil::Time durationEpsilon = IceUtil::Time::milliSeconds(-1);
(void) durationEpsilon;
// Query all entities from provider.
armem::client::query::Builder qb;
......@@ -152,18 +153,20 @@ namespace armarx::armem::client::robot_state::localization
// clang-format on
const armem::client::QueryResult qResult = memoryReader.query(qb.buildQueryInput());
ARMARX_DEBUG << "Lookup result in reader: " << qResult;
if (not qResult.success)
{
return {.transform =
return
{
.transform =
{
.header = query.header,
},
.status = TransformResult::Status::ErrorFrameNotAvailable,
.errorMessage = "Error in tf lookup '" + query.header.parentFrame + " -> " +
query.header.frame + "' : " + qResult.errorMessage};
query.header.frame + "' : " + qResult.errorMessage
};
}
const auto& localizationCoreSegment = qResult.memory.getCoreSegment(properties.localizationSegment);
......
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