From 430978b9e287ace7fea1ebe745622a492866ca4a Mon Sep 17 00:00:00 2001
From: "Christian R. G. Dreher" <c.dreher@kit.edu>
Date: Wed, 29 Apr 2020 19:43:13 +0200
Subject: [PATCH] Update after moving ObstacleAvoidance.
---
data/RobotAPI/VariantInfo-RobotAPI.xml | 47 ++++++++++---------
.../DSObstacleAvoidance.cpp | 2 +-
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/data/RobotAPI/VariantInfo-RobotAPI.xml b/data/RobotAPI/VariantInfo-RobotAPI.xml
index 3aed1f11c..011fbdf98 100644
--- a/data/RobotAPI/VariantInfo-RobotAPI.xml
+++ b/data/RobotAPI/VariantInfo-RobotAPI.xml
@@ -93,7 +93,7 @@
propertyIsOptional="true"
propertyDefaultValue="TCPControlUnitObserver" />
<Proxy include="RobotAPI/interface/units/HapticUnit.h"
- humanName="Haptic Unit Observer"
+ humanName="Haptic Unit Observer"
typeName="HapticUnitObserverInterfacePrx"
memberName="hapticObserver"
getterName="getHapticObserver"
@@ -101,7 +101,7 @@
propertyIsOptional="true"
propertyDefaultValue="HapticUnitObserver" />
<Proxy include="RobotAPI/interface/units/HandUnitInterface.h"
- humanName="Hand Unit "
+ humanName="Hand Unit "
typeName="HandUnitInterfacePrx"
memberName="handUnit"
getterName="getHandUnit"
@@ -109,7 +109,7 @@
propertyIsOptional="true"
propertyDefaultValue="HandUnit" />
<Proxy include="RobotAPI/interface/units/WeissHapticUnit.h"
- humanName="Weiss Haptic Unit"
+ humanName="Weiss Haptic Unit"
typeName="WeissHapticUnitInterfacePrx"
memberName="weissHapticUnit"
getterName="getWeissHapticUnit"
@@ -248,7 +248,6 @@
propertyIsOptional="true"
propertyDefaultValue="ArVizTopic">
</Topic>
-
<Topic include="RobotAPI/interface/speech/SpeechInterface.h"
humanName="Text to Speech Topic"
typeName="TextListenerInterfacePrx"
@@ -257,8 +256,14 @@
propertyName="TextToSpeechTopicName"
propertyIsOptional="true"
propertyDefaultValue="TextToSpeech" />
-
-
+ <Proxy include="RobotAPI/interface/components/DSObstacleAvoidanceInterface.h"
+ humanName="Platform obstacle avoidance"
+ typeName="ObstacleAvoidanceInterfacePrx"
+ memberName="platformObstacleAvoidance"
+ getterName="getPlatformObstacleAvoidance"
+ propertyName="PlatformObstacleAvoidanceName"
+ propertyIsOptional="true"
+ propertyDefaultValue="PlatformObstacleAvoidance" />
<Proxy include="RobotAPI/interface/observers/GraspCandidateObserverInterface.h"
humanName="Grasp Candidate Observer"
typeName="grasping::GraspCandidateObserverInterfacePrx"
@@ -267,23 +272,21 @@
propertyName="GraspCandidateObserverName"
propertyIsOptional="true"
propertyDefaultValue="GraspCandidateObserver" />
-
<Proxy include="RobotAPI/interface/components/FrameTrackingInterface.h"
- humanName="FrameTracking"
- typeName="FrameTrackingInterfacePrx"
- memberName="frameTracking"
- getterName="getFrameTracking"
- propertyName="FrameTrackingName"
- propertyIsOptional="true"
- propertyDefaultValue="FrameTracking" />
-
+ humanName="FrameTracking"
+ typeName="FrameTrackingInterfacePrx"
+ memberName="frameTracking"
+ getterName="getFrameTracking"
+ propertyName="FrameTrackingName"
+ propertyIsOptional="true"
+ propertyDefaultValue="FrameTracking" />
<Proxy include="RobotAPI/interface/units/MultiHandUnitInterface.h"
- humanName="MultiHandUnit"
- typeName="MultiHandUnitInterfacePrx"
- memberName="multiHandUnit"
- getterName="getMultiHandUnit"
- propertyName="MultiHandUnitName"
- propertyIsOptional="true"
- propertyDefaultValue="MultiHandUnit" />
+ humanName="MultiHandUnit"
+ typeName="MultiHandUnitInterfacePrx"
+ memberName="multiHandUnit"
+ getterName="getMultiHandUnit"
+ propertyName="MultiHandUnitName"
+ propertyIsOptional="true"
+ propertyDefaultValue="MultiHandUnit" />
</Lib>
</VariantInfo>
diff --git a/source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp b/source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
index fa0ce6783..5278fcda7 100644
--- a/source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
+++ b/source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
@@ -143,7 +143,7 @@ namespace armarx::dsobstacleavoidance
const std::string
-armarx::DSObstacleAvoidance::default_name = "ObstacleAvoidance";
+armarx::DSObstacleAvoidance::default_name = "DSObstacleAvoidance";
armarx::DSObstacleAvoidance::DSObstacleAvoidance()
--
GitLab