From a8b19c7c63f47b9fd396e854e9d39e1cbb53db7a Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 19 Apr 2021 10:25:32 +0200
Subject: [PATCH] Rename interface file to *Interface.ice
---
.../components/ObjectPoseObserver/ObjectPoseObserver.h | 4 ++--
.../RobotAPI/components/ObjectPoseObserver/detail/Data.h | 2 +-
.../ObjectPoseObserver/detail/RobotHeadMovement.h | 2 +-
.../ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h | 2 +-
.../ObjectPoseGui/ObjectPoseGuiWidgetController.h | 2 +-
source/RobotAPI/interface/CMakeLists.txt | 2 +-
...ectPoseObserver.ice => ObjectPoseObserverInterface.ice} | 7 ++++++-
7 files changed, 13 insertions(+), 8 deletions(-)
rename source/RobotAPI/interface/objectpose/{ObjectPoseObserver.ice => ObjectPoseObserverInterface.ice} (96%)
diff --git a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
index d29ad4565..22956a0d9 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
+++ b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
@@ -28,7 +28,7 @@
#include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
-#include <RobotAPI/interface/objectpose/ObjectPoseObserver.h>
+#include <RobotAPI/interface/objectpose/ObjectPoseObserverInterface.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h>
@@ -56,7 +56,7 @@ namespace armarx
*/
class ObjectPoseObserver :
virtual public Observer
- , virtual public objpose::ObjectPoseObserverInterface
+ , virtual public armarx::objpose::ObjectPoseObserverInterface
, virtual public armarx::RobotStateComponentPluginUser
, virtual public armarx::LightweightRemoteGuiComponentPluginUser
, virtual public armarx::ArVizComponentPluginUser
diff --git a/source/RobotAPI/components/ObjectPoseObserver/detail/Data.h b/source/RobotAPI/components/ObjectPoseObserver/detail/Data.h
index e825a9534..b6cf8eb08 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/detail/Data.h
+++ b/source/RobotAPI/components/ObjectPoseObserver/detail/Data.h
@@ -10,7 +10,7 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/interface/core/RobotState.h>
-#include <RobotAPI/interface/objectpose/ObjectPoseObserver.h>
+#include <RobotAPI/interface/objectpose/ObjectPoseObserverInterface.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectID.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectPose.h>
diff --git a/source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h b/source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h
index fdd6078d9..263266cf4 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h
+++ b/source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h
@@ -12,7 +12,7 @@
#include <ArmarXGui/libraries/RemoteGui/Client/Widgets.h>
#include <RobotAPI/interface/observers/KinematicUnitObserverInterface.h>
-#include <RobotAPI/interface/objectpose/ObjectPoseObserver.h>
+#include <RobotAPI/interface/objectpose/ObjectPoseObserverInterface.h>
namespace armarx
diff --git a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h
index 738482cc1..75058206b 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h
+++ b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h
@@ -2,7 +2,7 @@
#include <ArmarXCore/core/Component.h>
-#include <RobotAPI/interface/objectpose/ObjectPoseObserver.h>
+#include <RobotAPI/interface/objectpose/ObjectPoseObserverInterface.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectPose.h>
diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h
index 84a0e6e96..6caf1bd45 100644
--- a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h
+++ b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h
@@ -29,7 +29,7 @@
#include <ArmarXCore/core/system/ImportExportComponent.h>
-#include <RobotAPI/interface/objectpose/ObjectPoseObserver.h>
+#include <RobotAPI/interface/objectpose/ObjectPoseObserverInterface.h>
namespace armarx
diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index d8f47110e..c15d822bd 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -36,7 +36,7 @@ set(SLICE_FILES
ArmarXObjects/ArmarXObjectsTypes.ice
objectpose/object_pose_types.ice
- objectpose/ObjectPoseObserver.ice
+ objectpose/ObjectPoseObserverInterface.ice
objectpose/ObjectPoseProvider.ice
units/MultiHandUnitInterface.ice
diff --git a/source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice b/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
similarity index 96%
rename from source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
rename to source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
index 068cba470..32950130f 100644
--- a/source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
+++ b/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
@@ -27,6 +27,8 @@
#include <ArmarXCore/interface/core/BasicTypes.ice>
#include <ArmarXCore/interface/observers/ObserverInterface.ice>
+#include <RobotAPI/interface/armem/server/MemoryInterface.ice>
+
#include <RobotAPI/interface/objectpose/object_pose_types.ice>
#include <RobotAPI/interface/objectpose/ObjectPoseProvider.ice>
@@ -135,7 +137,10 @@ module armarx
long discardUpdatesUntilMilliSeconds = -1;
};
- interface ObjectPoseObserverInterface extends ObserverInterface, ObjectPoseTopic
+ interface ObjectPoseObserverInterface extends
+ ObserverInterface,
+ ObjectPoseTopic,
+ armem::server::MemoryInterface
{
// Object poses
--
GitLab