From 4397230b0503914184a9d342616b529d769c4947 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 16 Aug 2021 16:40:22 +0200
Subject: [PATCH] Fix visu in ObjectMemory
---
.../server/ObjectMemory/ObjectMemory.cpp | 2 --
.../armem/server/ObjectMemory/ObjectMemory.h | 21 ++++++++-----------
.../server/instance/SegmentAdapter.cpp | 3 ++-
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
index c624379b8..40ceb2864 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
@@ -22,8 +22,6 @@
#include "ObjectMemory.h"
-#include <mutex>
-
namespace armarx::armem::server::obj
{
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h
index b90406be3..44332653f 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h
@@ -22,23 +22,20 @@
#pragma once
-#include <memory>
-#include <mutex>
-
-#include <VirtualRobot/VirtualRobot.h>
-
-#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
+#include <RobotAPI/libraries/armem_objects/server/class/Segment.h>
+#include <RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h>
+#include <RobotAPI/libraries/armem_objects/server/attachments/Segment.h>
-#include <RobotAPI/interface/armem/server/ObjectMemoryInterface.h>
+#include <RobotAPI/libraries/armem/server/ComponentPlugin.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h>
-#include <RobotAPI/libraries/armem/server/ComponentPlugin.h>
+#include <RobotAPI/interface/armem/server/ObjectMemoryInterface.h>
-#include <RobotAPI/libraries/armem_objects/server/class/Segment.h>
-#include <RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h>
-#include <RobotAPI/libraries/armem_objects/server/attachments/Segment.h>
+#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
+
+#include <memory>
#define ICE_CURRENT_ARG const Ice::Current& = Ice::emptyCurrent
@@ -79,7 +76,7 @@ namespace armarx::armem::server::obj
public:
ObjectMemory();
- virtual ~ObjectMemory();
+ virtual ~ObjectMemory() override;
/// @see armarx::ManagedIceObject::getDefaultName()
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp
index a9f2aaf31..ef00638e9 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp
@@ -448,7 +448,8 @@ namespace armarx::armem::server::obj::instance
objpose::ObjectPoseMap objectPoses;
visu.minConfidence = -1;
- return segment.doLocked([this, &objectPoses, &objectFinder]()
+
+ segment.doLocked([this, &objectPoses, &objectFinder]()
{
const IceUtil::Time now = TimeUtil::GetTime();
--
GitLab