From e21c343b402bafc264e8b143713cfa907df157f3 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 9 Oct 2020 10:52:25 +0200
Subject: [PATCH] Move RequestedObjects
---
.../RobotAPI/components/ObjectPoseObserver/CMakeLists.txt | 2 ++
.../plugins}/RequestedObjects.cpp | 0
.../plugins}/RequestedObjects.h | 0
.../components/ObjectPoseProviderExample/CMakeLists.txt | 4 ----
.../ObjectPoseProviderExample/ObjectPoseProviderExample.h | 8 +++-----
5 files changed, 5 insertions(+), 9 deletions(-)
rename source/RobotAPI/components/{ObjectPoseProviderExample => ObjectPoseObserver/plugins}/RequestedObjects.cpp (100%)
rename source/RobotAPI/components/{ObjectPoseProviderExample => ObjectPoseObserver/plugins}/RequestedObjects.h (100%)
diff --git a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
index 439322b17..2dac9b5a5 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SOURCES
plugins/ObjectPoseProviderPlugin.cpp
plugins/ObjectPoseClientPlugin.cpp
+ plugins/RequestedObjects.cpp
ice_conversions.cpp
json_conversions.cpp
@@ -25,6 +26,7 @@ set(HEADERS
plugins/ObjectPoseProviderPlugin.h
plugins/ObjectPoseClientPlugin.h
+ plugins/RequestedObjects.h
ice_conversions.h
json_conversions.h
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.cpp b/source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.cpp
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.cpp
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.cpp
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.h b/source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.h
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt b/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
index 3179669cd..fae15ee0a 100644
--- a/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
@@ -10,13 +10,9 @@ set(COMPONENT_LIBS
set(SOURCES
ObjectPoseProviderExample.cpp
-
- RequestedObjects.cpp
)
set(HEADERS
ObjectPoseProviderExample.h
-
- RequestedObjects.h
)
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h b/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
index cd31fa61d..aac11a5f1 100644
--- a/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
+++ b/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
@@ -22,22 +22,20 @@
#pragma once
+#include <mutex>
#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/interface/observers/ObserverInterface.h>
+#include <ArmarXCore/core/services/tasks/TaskUtil.h>
// #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
-
// Include the ProviderPlugin
#include <RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.h>
+#include <RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
-#include <mutex>
-#include <ArmarXCore/core/services/tasks/TaskUtil.h>
-#include "RequestedObjects.h"
-
namespace armarx
{
--
GitLab