Skip to content
Snippets Groups Projects
Commit e6a489ec authored by Philip Scherer's avatar Philip Scherer
Browse files

Fix prediction errors in ObjectMemory

parent 0315c8de
No related branches found
No related tags found
1 merge request!254Add GUI for armem predictions to MemoryViewer
...@@ -251,7 +251,7 @@ namespace armarx::armem::server::obj ...@@ -251,7 +251,7 @@ namespace armarx::armem::server::obj
if (objPoseResult.success) if (objPoseResult.success)
{ {
armem::client::QueryBuilder builder; armem::client::QueryBuilder builder;
builder.singleEntitySnapshot(boRequest.snapshotID); builder.latestEntitySnapshot(boRequest.snapshotID);
auto queryResult = armarx::fromIce<armem::client::QueryResult>( auto queryResult = armarx::fromIce<armem::client::QueryResult>(
query(builder.buildQueryInputIce())); query(builder.buildQueryInputIce()));
std::string instanceError = std::string instanceError =
...@@ -263,11 +263,12 @@ namespace armarx::armem::server::obj ...@@ -263,11 +263,12 @@ namespace armarx::armem::server::obj
} }
else else
{ {
auto* aronInstance = queryResult.memory.findInstance(boRequest.snapshotID); auto* aronInstance = queryResult.memory.findLatestInstance(
boRequest.snapshotID, boRequest.snapshotID.instanceIndex);
if (aronInstance == nullptr) if (aronInstance == nullptr)
{ {
result.success = false; result.success = false;
result.errorMessage << instanceError; result.errorMessage << instanceError << ": No latest instance found.";
} }
else else
{ {
......
...@@ -120,7 +120,14 @@ namespace armarx::armem ...@@ -120,7 +120,14 @@ namespace armarx::armem
ice.success = result.success; ice.success = result.success;
ice.errorMessage = result.errorMessage; ice.errorMessage = result.errorMessage;
toIce(ice.snapshotID, result.snapshotID); toIce(ice.snapshotID, result.snapshotID);
ice.prediction = result.prediction->toAronDictDTO(); if (result.prediction)
{
ice.prediction = result.prediction->toAronDictDTO();
}
else
{
ice.prediction = nullptr;
}
} }
void void
......
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