From f49edeb8a3be4d4ef72b74fda0a7d73763c98492 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 20 May 2020 10:55:21 +0200
Subject: [PATCH] Add Suffix "Plugin" to plugin files to match plugin name

---
 .../ObjectPoseObserver/CMakeLists.txt         |  8 ++--
 .../ObjectPoseObserver/ProvidedObjectPose.cpp | 12 ++++++
 .../ObjectPoseObserver/ProvidedObjectPose.h   | 41 +++++++++++++++++++
 ...eClient.cpp => ObjectPoseClientPlugin.cpp} |  2 +-
 ...tPoseClient.h => ObjectPoseClientPlugin.h} |  0
 ...vider.cpp => ObjectPoseProviderPlugin.cpp} |  2 +-
 ...eProvider.h => ObjectPoseProviderPlugin.h} |  0
 7 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.cpp
 create mode 100644 source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.h
 rename source/RobotAPI/components/ObjectPoseObserver/plugins/{ObjectPoseClient.cpp => ObjectPoseClientPlugin.cpp} (97%)
 rename source/RobotAPI/components/ObjectPoseObserver/plugins/{ObjectPoseClient.h => ObjectPoseClientPlugin.h} (100%)
 rename source/RobotAPI/components/ObjectPoseObserver/plugins/{ObjectPoseProvider.cpp => ObjectPoseProviderPlugin.cpp} (97%)
 rename source/RobotAPI/components/ObjectPoseObserver/plugins/{ObjectPoseProvider.h => ObjectPoseProviderPlugin.h} (100%)

diff --git a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
index a02e5cc64..a2587dc0c 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
@@ -12,8 +12,8 @@ set(COMPONENT_LIBS
 set(SOURCES
     ObjectPoseObserver.cpp
 
-    plugins/ObjectPoseProvider.cpp
-    plugins/ObjectPoseClient.cpp
+    plugins/ObjectPoseProviderPlugin.cpp
+    plugins/ObjectPoseClientPlugin.cpp
 
     ObjectFinder.cpp
     ice_conversions.cpp
@@ -22,8 +22,8 @@ set(SOURCES
 set(HEADERS
     ObjectPoseObserver.h
 
-    plugins/ObjectPoseProvider.h
-    plugins/ObjectPoseClient.h
+    plugins/ObjectPoseProviderPlugin.h
+    plugins/ObjectPoseClientPlugin.h
 
     ObjectFinder.h
     ice_conversions.h
diff --git a/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.cpp b/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.cpp
new file mode 100644
index 000000000..ecf05de2b
--- /dev/null
+++ b/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.cpp
@@ -0,0 +1,12 @@
+#include "ProvidedObjectPose.h"
+
+
+namespace armarx::objpose
+{
+    ProvidedObjectPose::ProvidedObjectPose(const data::ProvidedObjectPose& ice)
+    {
+
+    }
+}
+
+
diff --git a/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.h b/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.h
new file mode 100644
index 000000000..afc47fe51
--- /dev/null
+++ b/source/RobotAPI/components/ObjectPoseObserver/ProvidedObjectPose.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <Eigen/Core>
+
+#include <RobotAPI/interface/objectpose/types.h>
+
+
+namespace armarx::objpose
+{
+
+    struct ProvidedObjectPose
+    {
+        ProvidedObjectPose();
+        ProvidedObjectPose(const data::ProvidedObjectPose& ice);
+
+
+        /// Name of the providing component.
+        std::string providerName;
+        /// Known or unknown object.
+        ObjectTypeEnum objectType = AnyObject;
+
+        /// The object ID, i.e. dataset and name.
+        ObjectID objectID;
+
+        /// Pose in `objectPoseFrame`.
+        Eigen::Matrix4f objectPose;
+        std::string objectPoseFrame;
+
+        /// Confidence in [0, 1] (1 = full, 0 = none).
+        float confidence = 0;
+        /// Source timestamp.
+        long timestampMicroSeconds = -1;
+
+        /// Object bounding box in object's local coordinate frame.
+        Box localOOBB;
+    };
+
+
+
+
+}
diff --git a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClient.cpp b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.cpp
similarity index 97%
rename from source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClient.cpp
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.cpp
index 4e8107e06..bb921e04a 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClient.cpp
+++ b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.cpp
@@ -1,4 +1,4 @@
-#include "ObjectPoseClient.h"
+#include "ObjectPoseClientPlugin.h"
 
 
 namespace armarx::plugins
diff --git a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClient.h b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClient.h
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseClientPlugin.h
diff --git a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProvider.cpp b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.cpp
similarity index 97%
rename from source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProvider.cpp
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.cpp
index e64043d2e..d614e214f 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProvider.cpp
+++ b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.cpp
@@ -1,4 +1,4 @@
-#include "ObjectPoseProvider.h"
+#include "ObjectPoseProviderPlugin.h"
 
 namespace armarx::plugins
 {
diff --git a/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProvider.h b/source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.h
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProvider.h
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.h
-- 
GitLab