From 19b279728fffe58ac54a8991819a233ff2dfefc1 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 26 Apr 2021 09:59:39 +0200
Subject: [PATCH] Fix name of member variable
---
.../ArmarXObjects/plugins/ObjectPoseClientPlugin.cpp | 6 +++---
.../ArmarXObjects/plugins/ObjectPoseClientPlugin.h | 11 ++++++++++-
.../ArmarXObjects/plugins/ObjectPoseProviderPlugin.h | 2 ++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.cpp b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.cpp
index a50a17849..b12572855 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.cpp
@@ -20,7 +20,7 @@ namespace armarx::plugins
void ObjectPoseClientPlugin::preOnConnectComponent()
{
- parent<ObjectPoseClientPluginUser>().ObjectPoseStorage = createObjectPoseStorage();
+ parent<ObjectPoseClientPluginUser>().objectPoseStorage = createObjectPoseStorage();
}
objpose::ObjectPoseStorageInterfacePrx ObjectPoseClientPlugin::createObjectPoseStorage()
@@ -54,12 +54,12 @@ namespace armarx
objpose::ObjectPoseSeq ObjectPoseClientPluginUser::getObjectPoses()
{
- if (!ObjectPoseStorage)
+ if (!objectPoseStorage)
{
ARMARX_WARNING << "No object pose observer.";
return {};
}
- return objpose::fromIce(ObjectPoseStorage->getObjectPoses());
+ return objpose::fromIce(objectPoseStorage->getObjectPoses());
}
plugins::ObjectPoseClientPlugin& ObjectPoseClientPluginUser::getObjectPoseClientPlugin()
diff --git a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h
index a832236ea..996f699ac 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h
@@ -11,6 +11,7 @@ namespace armarx::plugins
class ObjectPoseClientPlugin : public ComponentPlugin
{
public:
+
using ComponentPlugin::ComponentPlugin;
void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override;
@@ -37,13 +38,16 @@ namespace armarx::plugins
const ObjectFinder& setObjectFinderPath(const std::string& path);
const ObjectFinder& getObjectFinder() const;
+
private:
+
void preOnInitComponent() override;
void preOnConnectComponent() override;
static constexpr const char* PROPERTY_NAME = "ObjectMemoryName";
ObjectFinder _finder;
+
};
}
@@ -56,13 +60,14 @@ namespace armarx
virtual public ManagedIceObject
{
public:
+
/// Allow usage like: ObjectPoseClient::getObjects()
using ObjectPoseClient = ObjectPoseClientPluginUser;
ObjectPoseClientPluginUser();
objpose::ObjectPoseStorageInterfacePrx createObjectPoseStorage();
- objpose::ObjectPoseStorageInterfacePrx ObjectPoseStorage;
+ objpose::ObjectPoseStorageInterfacePrx objectPoseStorage;
objpose::ObjectPoseSeq getObjectPoses();
@@ -70,7 +75,11 @@ namespace armarx
const plugins::ObjectPoseClientPlugin& getObjectPoseClientPlugin() const;
const ObjectFinder& getObjectFinder() const;
+
+
private:
+
armarx::plugins::ObjectPoseClientPlugin* plugin = nullptr;
+
};
}
diff --git a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h
index 332064711..2f7c87ef5 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h
@@ -11,6 +11,7 @@ namespace armarx::plugins
class ObjectPoseProviderPlugin : public ComponentPlugin
{
public:
+
using ComponentPlugin::ComponentPlugin;
void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override;
@@ -52,6 +53,7 @@ namespace armarx
objpose::ObjectPoseTopicPrx objectPoseTopic;
+
private:
armarx::plugins::ObjectPoseProviderPlugin* plugin = nullptr;
--
GitLab