From c3935157f6e260ab05091b280533ea27319ada28 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Wed, 5 May 2021 10:42:57 +0200
Subject: [PATCH] removing articulated object ice interfaces
---
source/RobotAPI/interface/CMakeLists.txt | 4 --
.../core/articulated_object/provider.ice | 58 -------------------
.../core/articulated_object/topic.ice | 24 --------
.../core/articulated_object/types.ice | 50 ----------------
4 files changed, 136 deletions(-)
delete mode 100644 source/RobotAPI/interface/core/articulated_object/provider.ice
delete mode 100644 source/RobotAPI/interface/core/articulated_object/topic.ice
delete mode 100644 source/RobotAPI/interface/core/articulated_object/types.ice
diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index 0bde0f922..b2913fb4c 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -10,10 +10,6 @@ set(SLICE_FILES
observers/ObserverFilters.ice
observers/GraspCandidateObserverInterface.ice
- core/articulated_object/types.ice
- core/articulated_object/topic.ice
- core/articulated_object/provider.ice
-
core/BlackWhitelist.ice
core/PoseBase.ice
core/GeometryBase.ice
diff --git a/source/RobotAPI/interface/core/articulated_object/provider.ice b/source/RobotAPI/interface/core/articulated_object/provider.ice
deleted file mode 100644
index 1534ab3e6..000000000
--- a/source/RobotAPI/interface/core/articulated_object/provider.ice
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#pragma once
-
-#include <ArmarXCore/interface/observers/Timestamp.ice>
-#include <ArmarXCore/interface/core/BasicTypes.ice>
-
-#include <RobotAPI/interface/core/FramedPoseBase.ice>
-#include <RobotAPI/interface/core/articulated_object/types.ice>
-
-
-module armarx
-{
-
- module articulated_object
- {
-
- module provider
- {
-
- interface ArticulatedObjectStateProvider;
-
-
- struct ProviderInfo
- {
- ArticulatedObjectStateProvider* proxy;
- data::ArticulatedObjectIDs supportedObjects;
- };
-
- struct TrackingRequest
- {
- /// Object IDs.
- data::ArticulatedObjectIDs objectIDs;
-
- /// For how long to request localization. Negative for no timeout.
- long relativeTimeoutMS;
- };
-
- dictionary<data::ArticulatedObjectID, bool> TrackingRequestStatus;
-
- struct TrackingRequestResponse
- {
- TrackingRequestStatus status;
- };
-
- interface ArticulatedObjectStateProvider
- {
- /// Get the provider info.
- ProviderInfo getProviderInfo();
-
- /// Request to track the specified objects for some time.
- TrackingRequestResponse trackObjects(TrackingRequest input);
- };
-
- };
-
- }
-
-}
\ No newline at end of file
diff --git a/source/RobotAPI/interface/core/articulated_object/topic.ice b/source/RobotAPI/interface/core/articulated_object/topic.ice
deleted file mode 100644
index 33d02ec0c..000000000
--- a/source/RobotAPI/interface/core/articulated_object/topic.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#pragma once
-
-#include <ArmarXCore/interface/observers/Timestamp.ice>
-#include <ArmarXCore/interface/core/BasicTypes.ice>
-
-#include <RobotAPI/interface/core/FramedPoseBase.ice>
-#include <RobotAPI/interface/core/articulated_object/types.ice>
-
-
-module armarx
-{
-
- module articulated_object
- {
-
- interface ArticulatedObjectTopic
- {
- void reportArticulatedObjects(string provider, data::ArticulatedObjects objects);
- };
-
- }
-
-}
\ No newline at end of file
diff --git a/source/RobotAPI/interface/core/articulated_object/types.ice b/source/RobotAPI/interface/core/articulated_object/types.ice
deleted file mode 100644
index 544b4e630..000000000
--- a/source/RobotAPI/interface/core/articulated_object/types.ice
+++ /dev/null
@@ -1,50 +0,0 @@
-
-#pragma once
-
-#include <ArmarXCore/interface/observers/Timestamp.ice>
-#include <ArmarXCore/interface/core/BasicTypes.ice>
-
-#include <RobotAPI/interface/core/FramedPoseBase.ice>
-
-
-module armarx
-{
-
- module articulated_object
- {
-
- module data
- {
-
- dictionary<string, float> JointPositions;
-
- struct Config
- {
- double timestamp;
- FramedPoseBase globalPose;
- JointPositions jointMap;
- };
-
- struct ArticulatedObjectID
- {
- string name;
- string xml;
-
- // string instance;
- };
-
- struct ArticulatedObject
- {
- ArticulatedObjectID id;
- Config config;
- }
-
- sequence<ArticulatedObject> ArticulatedObjects;
-
- sequence<ArticulatedObjectID> ArticulatedObjectIDs;
-
- }
-
- }
-
-}
\ No newline at end of file
--
GitLab