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

Update usages

parent f4708e78
No related branches found
No related tags found
3 merge requests!192Fix bugs in ArMem and make disk loading and storing nicer,!190ArMem: Revice get/find interface,!188ArMem Updates
......@@ -70,7 +70,11 @@ namespace armarx
bool trim = true;
p.core.defaultCoreSegments = simox::alg::split(p.core._defaultSegmentsStr, ",", trim);
p.core._defaultSegmentsStr.clear();
workingMemory.addCoreSegments(p.core.defaultCoreSegments);
for (const std::string& name : p.core.defaultCoreSegments)
{
workingMemory.addCoreSegment(name);
}
}
void ExampleMemory::onConnectComponent()
......
......@@ -272,11 +272,11 @@ namespace armarx::armem::client
{
if (id.hasInstanceIndex())
{
result[id] = queryResult.memory.getEntityInstance(id);
result[id] = queryResult.memory.getInstance(id);
}
else if (id.hasTimestamp())
{
result[id] = queryResult.memory.getEntitySnapshot(id).getInstance(0);
result[id] = queryResult.memory.getSnapshot(id).getInstance(0);
}
else if (id.hasEntityName())
{
......
......@@ -116,7 +116,7 @@ namespace armarx::armem::client
{
try
{
wm::EntitySnapshot& snapshot = result.memory.getEntitySnapshot(snapshotID);
wm::EntitySnapshot& snapshot = result.memory.getSnapshot(snapshotID);
return snapshot;
}
catch (const armem::error::ArMemError&)
......
......@@ -325,7 +325,7 @@ namespace armarx::armem::gui
{
try
{
snapshot = &data->getEntitySnapshot(id);
snapshot = &data->getSnapshot(id);
}
catch (const armem::error::ArMemError& e)
{
......@@ -373,11 +373,11 @@ namespace armarx::armem::gui
if (id.hasInstanceIndex())
{
instance = data->getEntityInstance(id);
instance = data->getInstance(id);
}
else if (id.hasTimestamp())
{
instance = data->getEntitySnapshot(id).getInstance(0);
instance = data->getSnapshot(id).getInstance(0);
}
else
{
......
......@@ -104,7 +104,7 @@ namespace armarx::armem::gui::instance
const armem::wm::EntityInstance* instance = nullptr;
try
{
instance = &memory.getEntityInstance(id);
instance = &memory.getInstance(id);
if (useTypeInfo)
{
aronType = memory.getProviderSegment(id).aronType();
......
......@@ -32,7 +32,7 @@ namespace armarx::armem::server::obj::clazz
viz::Layer layer = arviz.layer(properties.layerName);
if (properties.show)
{
const wm::Entity* entity = classCoreSegment.findEntity(MemoryID().withEntityName(properties.entityName));
const wm::Entity* entity = classCoreSegment.findEntity(properties.entityName);
if (entity)
{
ARMARX_INFO << "Drawing floor class '" << properties.entityName << "'.";
......
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