diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp index 422419b7821762e9b808a23e5946dc49bea14918..91ea5b23400f568891326f6dd6c79b5e603d229c 100644 --- a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp +++ b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp @@ -54,9 +54,6 @@ namespace armarx::armem::server::obj classSegment.defineProperties(defs, prefix + "cls."); instance::SegmentAdapter::defineProperties(defs, prefix + "inst."); - articulatedObjectInstanceSegment.defineProperties(defs, prefix + "articulated.inst."); - articulatedObjectClassSegment.defineProperties(defs, prefix + "articulated.cls."); - attachmentSegment.defineProperties(defs, prefix + "attachments."); return defs; @@ -68,10 +65,6 @@ namespace armarx::armem::server::obj server::ComponentPluginUser::workingMemoryMutex), classSegment(server::ComponentPluginUser::iceMemory, server::ComponentPluginUser::workingMemoryMutex), - articulatedObjectClassSegment(server::ComponentPluginUser::iceMemory, - server::ComponentPluginUser::workingMemoryMutex), - articulatedObjectInstanceSegment(server::ComponentPluginUser::iceMemory, - server::ComponentPluginUser::workingMemoryMutex), attachmentSegment(server::ComponentPluginUser::iceMemory, server::ComponentPluginUser::workingMemoryMutex) { @@ -115,17 +108,6 @@ namespace armarx::armem::server::obj instance::SegmentAdapter::init(); - initSegmentWithCatch("articulated object class", [&]() - { - articulatedObjectClassSegment.init(); - }); - - initSegmentWithCatch("articulated object instance", [&]() - { - articulatedObjectInstanceSegment.setArticulatedObjectClassSegment(articulatedObjectClassSegment); - articulatedObjectInstanceSegment.init(); - }); - initSegmentWithCatch("attachment", [&]() { attachmentSegment.init(); @@ -159,14 +141,6 @@ namespace armarx::armem::server::obj ArVizComponentPluginUser::getArvizClient() ); - articulatedObjectClassSegment.connect( - ArVizComponentPluginUser::getArvizClient() - ); - - articulatedObjectInstanceSegment.connect( - ArVizComponentPluginUser::getArvizClient() - ); - attachmentSegment.connect( ArVizComponentPluginUser::getArvizClient() ); diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h index a513016a3da9f0376a092768e4a977974493ca32..f29b2cef93efb2aa35a7983f4dce87d3db854b80 100644 --- a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h +++ b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h @@ -111,8 +111,6 @@ namespace armarx::armem::server::obj clazz::Segment classSegment; - articulated_object_class::Segment articulatedObjectClassSegment; - articulated_object_instance::Segment articulatedObjectInstanceSegment; attachments::Segment attachmentSegment; // associations::Segment associationsSegment;