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

simplified implementation

parent 6a1c01ae
No related branches found
No related tags found
2 merge requests!157armem/dev => master,!145Feature/armem object memory attachments
......@@ -51,28 +51,9 @@ namespace armarx::armem::attachment
memoryReader.setReadingMemory(result.proxy);
}
std::optional<armem::MemoryID> Writer::add(const ObjectAttachment& attachment)
{
return commit(attachment, true);
}
std::optional<armem::MemoryID> Writer::remove(const ObjectAttachment& attachment)
std::optional<armem::MemoryID> Writer::commit(const ObjectAttachment& attachment)
{
return commit(attachment, false);
}
std::optional<armem::MemoryID> Writer::add(const ArticulatedObjectAttachment& attachment)
{
return commit(attachment, true);
}
std::optional<armem::MemoryID> Writer::remove(const ArticulatedObjectAttachment& attachment)
{
return commit(attachment, false);
}
std::optional<armem::MemoryID> Writer::commit(const ObjectAttachment& attachment, const bool active){
std::lock_guard g{memoryWriterMutex};
const auto result = memoryWriter.addSegment(properties.coreAttachmentsSegmentName, properties.providerName);
......@@ -96,7 +77,6 @@ namespace armarx::armem::attachment
arondto::attachment::ObjectAttachment aronAttachment;
toAron(aronAttachment, attachment);
aronAttachment.active = active;
update.instancesData = {aronAttachment.toAron()};
update.timeCreated = timestamp;
......@@ -116,7 +96,8 @@ namespace armarx::armem::attachment
}
std::optional<armem::MemoryID> Writer::commit(const ArticulatedObjectAttachment& attachment, const bool active){
std::optional<armem::MemoryID> Writer::commit(const ArticulatedObjectAttachment& attachment)
{
std::lock_guard g{memoryWriterMutex};
const auto result = memoryWriter.addSegment(properties.coreAttachmentsSegmentName, properties.providerName);
......@@ -140,7 +121,6 @@ namespace armarx::armem::attachment
arondto::attachment::ArticulatedObjectAttachment aronAttachment;
toAron(aronAttachment, attachment);
aronAttachment.active = active;
update.instancesData = {aronAttachment.toAron()};
update.timeCreated = timestamp;
......@@ -159,6 +139,6 @@ namespace armarx::armem::attachment
return updateResult.snapshotID;
}
} // namespace armarx::armem::attachment
\ No newline at end of file
......@@ -44,17 +44,10 @@ namespace armarx::armem::attachment
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
void connect();
std::optional<armem::MemoryID> add(const ObjectAttachment& attachment);
std::optional<armem::MemoryID> remove(const ObjectAttachment& attachment);
std::optional<armem::MemoryID> add(const ArticulatedObjectAttachment& attachment);
std::optional<armem::MemoryID> remove(const ArticulatedObjectAttachment& attachment);
// const std::string& getPropertyPrefix() const override;
std::optional<armem::MemoryID> commit(const ObjectAttachment& attachment);
std::optional<armem::MemoryID> commit(const ArticulatedObjectAttachment&);
private:
std::optional<armem::MemoryID> commit(const ObjectAttachment& attachment, bool active);
std::optional<armem::MemoryID> commit(const ArticulatedObjectAttachment& attachment, bool active);
struct Properties
{
......
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