Skip to content
Snippets Groups Projects
Commit 19b27972 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Fix name of member variable

parent e1d6dc08
No related branches found
No related tags found
2 merge requests!140armem/dev -> master,!133Add Object Memory with Class and Instance Segments
...@@ -20,7 +20,7 @@ namespace armarx::plugins ...@@ -20,7 +20,7 @@ namespace armarx::plugins
void ObjectPoseClientPlugin::preOnConnectComponent() void ObjectPoseClientPlugin::preOnConnectComponent()
{ {
parent<ObjectPoseClientPluginUser>().ObjectPoseStorage = createObjectPoseStorage(); parent<ObjectPoseClientPluginUser>().objectPoseStorage = createObjectPoseStorage();
} }
objpose::ObjectPoseStorageInterfacePrx ObjectPoseClientPlugin::createObjectPoseStorage() objpose::ObjectPoseStorageInterfacePrx ObjectPoseClientPlugin::createObjectPoseStorage()
...@@ -54,12 +54,12 @@ namespace armarx ...@@ -54,12 +54,12 @@ namespace armarx
objpose::ObjectPoseSeq ObjectPoseClientPluginUser::getObjectPoses() objpose::ObjectPoseSeq ObjectPoseClientPluginUser::getObjectPoses()
{ {
if (!ObjectPoseStorage) if (!objectPoseStorage)
{ {
ARMARX_WARNING << "No object pose observer."; ARMARX_WARNING << "No object pose observer.";
return {}; return {};
} }
return objpose::fromIce(ObjectPoseStorage->getObjectPoses()); return objpose::fromIce(objectPoseStorage->getObjectPoses());
} }
plugins::ObjectPoseClientPlugin& ObjectPoseClientPluginUser::getObjectPoseClientPlugin() plugins::ObjectPoseClientPlugin& ObjectPoseClientPluginUser::getObjectPoseClientPlugin()
......
...@@ -11,6 +11,7 @@ namespace armarx::plugins ...@@ -11,6 +11,7 @@ namespace armarx::plugins
class ObjectPoseClientPlugin : public ComponentPlugin class ObjectPoseClientPlugin : public ComponentPlugin
{ {
public: public:
using ComponentPlugin::ComponentPlugin; using ComponentPlugin::ComponentPlugin;
void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override; void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override;
...@@ -37,13 +38,16 @@ namespace armarx::plugins ...@@ -37,13 +38,16 @@ namespace armarx::plugins
const ObjectFinder& setObjectFinderPath(const std::string& path); const ObjectFinder& setObjectFinderPath(const std::string& path);
const ObjectFinder& getObjectFinder() const; const ObjectFinder& getObjectFinder() const;
private: private:
void preOnInitComponent() override; void preOnInitComponent() override;
void preOnConnectComponent() override; void preOnConnectComponent() override;
static constexpr const char* PROPERTY_NAME = "ObjectMemoryName"; static constexpr const char* PROPERTY_NAME = "ObjectMemoryName";
ObjectFinder _finder; ObjectFinder _finder;
}; };
} }
...@@ -56,13 +60,14 @@ namespace armarx ...@@ -56,13 +60,14 @@ namespace armarx
virtual public ManagedIceObject virtual public ManagedIceObject
{ {
public: public:
/// Allow usage like: ObjectPoseClient::getObjects() /// Allow usage like: ObjectPoseClient::getObjects()
using ObjectPoseClient = ObjectPoseClientPluginUser; using ObjectPoseClient = ObjectPoseClientPluginUser;
ObjectPoseClientPluginUser(); ObjectPoseClientPluginUser();
objpose::ObjectPoseStorageInterfacePrx createObjectPoseStorage(); objpose::ObjectPoseStorageInterfacePrx createObjectPoseStorage();
objpose::ObjectPoseStorageInterfacePrx ObjectPoseStorage; objpose::ObjectPoseStorageInterfacePrx objectPoseStorage;
objpose::ObjectPoseSeq getObjectPoses(); objpose::ObjectPoseSeq getObjectPoses();
...@@ -70,7 +75,11 @@ namespace armarx ...@@ -70,7 +75,11 @@ namespace armarx
const plugins::ObjectPoseClientPlugin& getObjectPoseClientPlugin() const; const plugins::ObjectPoseClientPlugin& getObjectPoseClientPlugin() const;
const ObjectFinder& getObjectFinder() const; const ObjectFinder& getObjectFinder() const;
private: private:
armarx::plugins::ObjectPoseClientPlugin* plugin = nullptr; armarx::plugins::ObjectPoseClientPlugin* plugin = nullptr;
}; };
} }
...@@ -11,6 +11,7 @@ namespace armarx::plugins ...@@ -11,6 +11,7 @@ namespace armarx::plugins
class ObjectPoseProviderPlugin : public ComponentPlugin class ObjectPoseProviderPlugin : public ComponentPlugin
{ {
public: public:
using ComponentPlugin::ComponentPlugin; using ComponentPlugin::ComponentPlugin;
void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override; void postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties) override;
...@@ -52,6 +53,7 @@ namespace armarx ...@@ -52,6 +53,7 @@ namespace armarx
objpose::ObjectPoseTopicPrx objectPoseTopic; objpose::ObjectPoseTopicPrx objectPoseTopic;
private: private:
armarx::plugins::ObjectPoseProviderPlugin* plugin = nullptr; armarx::plugins::ObjectPoseProviderPlugin* plugin = nullptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment