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

Fix visu in ObjectMemory

parent f7397b5e
No related branches found
No related tags found
1 merge request!188ArMem Updates
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include "ObjectMemory.h" #include "ObjectMemory.h"
#include <mutex>
namespace armarx::armem::server::obj namespace armarx::armem::server::obj
{ {
......
...@@ -22,23 +22,20 @@ ...@@ -22,23 +22,20 @@
#pragma once #pragma once
#include <memory> #include <RobotAPI/libraries/armem_objects/server/class/Segment.h>
#include <mutex> #include <RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h>
#include <RobotAPI/libraries/armem_objects/server/attachments/Segment.h>
#include <VirtualRobot/VirtualRobot.h>
#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.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/ArVizComponentPlugin.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.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 <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
#include <RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h>
#include <RobotAPI/libraries/armem_objects/server/attachments/Segment.h> #include <memory>
#define ICE_CURRENT_ARG const Ice::Current& = Ice::emptyCurrent #define ICE_CURRENT_ARG const Ice::Current& = Ice::emptyCurrent
...@@ -79,7 +76,7 @@ namespace armarx::armem::server::obj ...@@ -79,7 +76,7 @@ namespace armarx::armem::server::obj
public: public:
ObjectMemory(); ObjectMemory();
virtual ~ObjectMemory(); virtual ~ObjectMemory() override;
/// @see armarx::ManagedIceObject::getDefaultName() /// @see armarx::ManagedIceObject::getDefaultName()
......
...@@ -448,7 +448,8 @@ namespace armarx::armem::server::obj::instance ...@@ -448,7 +448,8 @@ namespace armarx::armem::server::obj::instance
objpose::ObjectPoseMap objectPoses; objpose::ObjectPoseMap objectPoses;
visu.minConfidence = -1; visu.minConfidence = -1;
return segment.doLocked([this, &objectPoses, &objectFinder]()
segment.doLocked([this, &objectPoses, &objectFinder]()
{ {
const IceUtil::Time now = TimeUtil::GetTime(); const IceUtil::Time now = TimeUtil::GetTime();
......
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