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

object memory: added attachments segment

parent 33de7dc7
No related branches found
No related tags found
No related merge requests found
......@@ -102,6 +102,14 @@ ArmarX.ArticulatedObjectLocalizerExample.mem.obj.articulated.ProviderName = Exam
# ArmarX.ArticulatedObjectLocalizerExample.tpc.sub.MemoryListener = MemoryUpdates
# ArmarX.ArticulatedObjectLocalizerExample.updateFrequency: Memory update frequency (write).
# Attributes:
# - Default: 25
# - Case sensitivity: yes
# - Required: no
# ArmarX.ArticulatedObjectLocalizerExample.updateFrequency = 25
# ArmarX.CachePath: Path for cache files. If relative path AND env. variable ARMARX_USER_CONFIG_DIR is set, the cache path will be made relative to ARMARX_USER_CONFIG_DIR. Otherwise if relative it will be relative to the default ArmarX config dir (${HOME}/.armarx)
# Attributes:
# - Default: mongo/.cache
......
......@@ -57,6 +57,8 @@ namespace armarx::armem::server::obj
articulatedObjectInstanceSegment.defineProperties(defs, prefix + "articulated.inst.");
articulatedObjectClassSegment.defineProperties(defs, prefix + "articulated.cls.");
attachmentSegment.defineProperties(defs, prefix + "attachments.");
return defs;
}
......@@ -69,7 +71,9 @@ namespace armarx::armem::server::obj
articulatedObjectClassSegment(server::ComponentPluginUser::iceMemory,
server::ComponentPluginUser::workingMemoryMutex),
articulatedObjectInstanceSegment(server::ComponentPluginUser::iceMemory,
server::ComponentPluginUser::workingMemoryMutex)
server::ComponentPluginUser::workingMemoryMutex),
attachmentSegment(server::ComponentPluginUser::iceMemory,
server::ComponentPluginUser::workingMemoryMutex)
{
}
......@@ -120,6 +124,10 @@ namespace armarx::armem::server::obj
articulatedObjectInstanceSegment.init();
});
initSegmentWithCatch("attachment", [&]()
{
attachmentSegment.init();
});
}
......@@ -155,12 +163,9 @@ namespace armarx::armem::server::obj
ArVizComponentPluginUser::getArvizClient()
);
// {
// std::lock_guard g(server::ComponentPluginUser::workingMemoryMutex);
// // server::ComponentPluginUser::workingMemory.addCoreSegment("ArticulatedObjectInstance"); // TODO , arondto::::toInitialAronType());
// server::ComponentPluginUser::workingMemory.addCoreSegment("ArticulatedObjectClass"); // TODO , arondto::::toInitialAronType());
// }
attachmentSegment.connect(
ArVizComponentPluginUser::getArvizClient()
);
createRemoteGuiTab();
RemoteGui_startRunningTask();
......
......@@ -40,6 +40,7 @@
#include <RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h>
#include <RobotAPI/libraries/armem_objects/server/articulated_object_instance/Segment.h>
#include <RobotAPI/libraries/armem_objects/server/articulated_object_class/Segment.h>
#include <RobotAPI/libraries/armem_objects/server/attachments/Segment.h>
#define ICE_CURRENT_ARG const Ice::Current& = Ice::emptyCurrent
......@@ -112,6 +113,7 @@ namespace armarx::armem::server::obj
articulated_object_class::Segment articulatedObjectClassSegment;
articulated_object_instance::Segment articulatedObjectInstanceSegment;
attachments::Segment attachmentSegment;
// associations::Segment associationsSegment;
......
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