From eb48069e47a95f07c498ea4071915df5ce177861 Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Mon, 7 Nov 2022 15:24:47 +0100
Subject: [PATCH] Rename PropertyHelper Factory and Products to VariantHelper
---
.../aron_component_config/CMakeLists.txt | 4 +-
.../PropertyDefinitionVisitors.cpp | 14 ++--
.../RemoteGuiVisitors.cpp | 22 ++---
.../{PropertyHelper.cpp => VariantHelper.cpp} | 74 ++++++++--------
.../{PropertyHelper.h => VariantHelper.h} | 84 +++++++++----------
5 files changed, 99 insertions(+), 99 deletions(-)
rename source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/{PropertyHelper.cpp => VariantHelper.cpp} (70%)
rename source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/{PropertyHelper.h => VariantHelper.h} (62%)
diff --git a/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt b/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
index cc784baff..db06c24e6 100644
--- a/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
@@ -29,7 +29,7 @@ set(LIBS
set(LIB_FILES
PropertyDefinitionVisitors.cpp
RemoteGuiVisitors.cpp
- TypeDescriptorFactories/PropertyHelper.cpp
+ TypeDescriptorFactories/VariantHelper.cpp
)
set(LIB_HEADERS
@@ -38,7 +38,7 @@ set(LIB_HEADERS
RemoteGuiVisitors.h
Util.h
ComponentPlugin.h
- TypeDescriptorFactories/PropertyHelper.h
+ TypeDescriptorFactories/VariantHelper.h
)
diff --git a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
index 739a7b5a2..967d498a8 100644
--- a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
@@ -26,7 +26,7 @@
#include <ArmarXCore/core/application/properties/PropertyDefinition.h>
#include <ArmarXCore/core/application/properties/PropertyUser.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
-#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.h>
+#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h>
#include "Util.h"
@@ -111,8 +111,8 @@ namespace armarx::aron::component_config
std::vector<std::string> vector = get_list();
std::for_each(vector.begin(), vector.end(), [&old_list, &i, &type](const auto& el)
{
- old_list->addElement(factories::PropertyHelper::make(type)->from_string(el,
- old_list->getPath()
+ old_list->addElement(factories::VariantHelper::make(type)->from_string(el,
+ old_list->getPath()
.withIndex(i)));
i++;
});
@@ -170,8 +170,8 @@ namespace armarx::aron::component_config
{
auto key_value = simox::alg::split(el, ":");
old_dict->addElement(key_value.front(),
- factories::PropertyHelper::make(type)->from_string(key_value.back(),
- old_dict->getPath()
+ factories::VariantHelper::make(type)->from_string(key_value.back(),
+ old_dict->getPath()
.withElement(key_value.front())));
});
}
@@ -289,7 +289,7 @@ namespace armarx::aron::component_config
std::vector<std::string> vector;
std::transform(input.begin(), input.end(), std::back_inserter(vector), [&type](const auto& el)
{
- return factories::PropertyHelper::make(type)->to_string(el);
+ return factories::VariantHelper::make(type)->to_string(el);
});
str = simox::alg::to_string(vector, ", ");
property_definitions_->defineOptionalProperty<std::string>(name, str);
@@ -317,7 +317,7 @@ namespace armarx::aron::component_config
for (const auto& [key, el]: input)
{
ss << key << ":";
- ss << factories::PropertyHelper::make(type)->to_string(el);
+ ss << factories::VariantHelper::make(type)->to_string(el);
ss << ",";
}
std::string value = ss.str();
diff --git a/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
index 553428bc9..9ebaba6f9 100644
--- a/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
@@ -25,7 +25,7 @@
#include <ArmarXGui/libraries/RemoteGui/RemoteGui.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
#include <ArmarXCore/util/CPPUtility/Iterator.h>
-#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.h>
+#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h>
#include "Util.h"
#define INPUT_GUARD(i) \
@@ -162,7 +162,7 @@ namespace armarx::aron::component_config
}
for (const auto& el: data->getElements())
{
- group.addChild(RemoteGui::makeLineEdit(pathToName(el)).value(factories::PropertyHelper::make(type)->to_string(
+ group.addChild(RemoteGui::makeLineEdit(pathToName(el)).value(factories::VariantHelper::make(type)->to_string(
el)), 10);
group.addHSpacer(8);
group.addChild(RemoteGui::makeButton(pathToName(el) + "_button").label("-").toolTip("Remove List Element"),
@@ -218,7 +218,7 @@ namespace armarx::aron::component_config
{
group.addChild(RemoteGui::makeLineEdit(pathToName(el.second) + "_lbl").value(el.first), 5);
group.addHSpacer(2);
- group.addChild(RemoteGui::makeLineEdit(pathToName(el.second)).value(factories::PropertyHelper::make(type)->to_string(
+ group.addChild(RemoteGui::makeLineEdit(pathToName(el.second)).value(factories::VariantHelper::make(type)->to_string(
el.second)), 5);
group.addHSpacer(6);
group.addChild(RemoteGui::makeButton(pathToName(el.second) + "_button").label("-")
@@ -426,12 +426,12 @@ namespace armarx::aron::component_config
tab_rebuild_required_ = true;
}
auto gui_value = proxy_->getValue<std::string>(pathToName(el)).get();
- factories::PropertyHelper::make(type)->set_value_from_string(el, gui_value);
+ factories::VariantHelper::make(type)->set_value_from_string(el, gui_value);
}
if (proxy_->getButtonClicked(pathToName(o) + "_add"))
{
- data->addElement(factories::PropertyHelper::make(type)->from_string("",
- o->getPath()
+ data->addElement(factories::VariantHelper::make(type)->from_string("",
+ o->getPath()
.withIndex(data->childrenSize())));
tab_rebuild_required_ = true;
}
@@ -472,12 +472,12 @@ namespace armarx::aron::component_config
}
auto gui_value = proxy_->getValue<std::string>(name).get();
auto gui_key = proxy_->getValue<std::string>(name + "_lbl").get();
- auto config_value = factories::PropertyHelper::make(type)->to_string(el);
+ auto config_value = factories::VariantHelper::make(type)->to_string(el);
if (gui_value != config_value)
{
if (proxy_->hasValueChanged(name))
{
- factories::PropertyHelper::make(type)->set_value_from_string(el, gui_value);
+ factories::VariantHelper::make(type)->set_value_from_string(el, gui_value);
} else
{
proxy_->setValue(config_value, name);
@@ -499,7 +499,7 @@ namespace armarx::aron::component_config
{
auto element = data->getElement(old_label);
data->removeElement(old_label);
- auto variantHelper = factories::PropertyHelper::make(type);
+ auto variantHelper = factories::VariantHelper::make(type);
data->addElement(new_label,
variantHelper->from_string(variantHelper->to_string(element),
o->getPath().withDetachedLastElement().withElement(new_label)));
@@ -509,8 +509,8 @@ namespace armarx::aron::component_config
if (proxy_->getButtonClicked(pathToName(o) + "_add"))
{
data->addElement("defaultKey",
- factories::PropertyHelper::make(type)->from_string("",
- o->getPath()
+ factories::VariantHelper::make(type)->from_string("",
+ o->getPath()
.withElement("defaultKey")));
tab_rebuild_required_ = true;
}
diff --git a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.cpp b/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp
similarity index 70%
rename from source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.cpp
rename to source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp
index 6d341d638..76670e105 100644
--- a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp
@@ -23,13 +23,13 @@
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
#include <ArmarXCore/core/application/properties/Property.h>
-#include "PropertyHelper.h"
+#include "VariantHelper.h"
namespace armarx::aron::component_config::products
{
template <>
std::string
- PropertyHelper<type::Descriptor::INT>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::INT>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
return simox::alg::to_string(data::Int::DynamicCast(ptr)->getValue());
@@ -37,7 +37,7 @@ namespace armarx::aron::component_config::products
template <>
std::string
- PropertyHelper<type::Descriptor::BOOL>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::BOOL>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
return simox::alg::to_string(data::Bool::DynamicCast(ptr)->getValue());
@@ -45,7 +45,7 @@ namespace armarx::aron::component_config::products
template <>
std::string
- PropertyHelper<type::Descriptor::STRING>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::STRING>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
return data::String::DynamicCast(ptr)->getValue();
@@ -53,7 +53,7 @@ namespace armarx::aron::component_config::products
template <>
std::string
- PropertyHelper<type::Descriptor::FLOAT>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::FLOAT>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
return simox::alg::to_string(data::Float::DynamicCast(ptr)->getValue());
@@ -61,7 +61,7 @@ namespace armarx::aron::component_config::products
template <>
std::string
- PropertyHelper<type::Descriptor::INT_ENUM>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::INT_ENUM>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
// TODO: this is should use the name of the enum value
@@ -70,7 +70,7 @@ namespace armarx::aron::component_config::products
template <>
std::string
- PropertyHelper<type::Descriptor::DOUBLE>::to_string(const data::VariantPtr& ptr) const
+ VariantHelper<type::Descriptor::DOUBLE>::to_string(const data::VariantPtr& ptr) const
{
ARMARX_TRACE;
return simox::alg::to_string(data::Double::DynamicCast(ptr)->getValue());
@@ -78,8 +78,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::INT>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::INT>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
ARMARX_TRACE;
return make_int(std::stoi(string), path);
@@ -87,8 +87,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::FLOAT>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::FLOAT>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
ARMARX_TRACE;
return make_float(std::stof(string), path);
@@ -96,8 +96,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::DOUBLE>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::DOUBLE>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
ARMARX_TRACE;
return make_double(std::stod(string), path);
@@ -105,8 +105,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::BOOL>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::BOOL>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
ARMARX_TRACE;
if (string == "true")
@@ -121,8 +121,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::INT_ENUM>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::INT_ENUM>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
// TODO: this might not work
ARMARX_TRACE;
@@ -131,8 +131,8 @@ namespace armarx::aron::component_config::products
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::STRING>::from_string(const std::string& string,
- const armarx::aron::Path& path) const
+ products::VariantHelper<type::Descriptor::STRING>::from_string(const std::string& string,
+ const armarx::aron::Path& path) const
{
ARMARX_TRACE;
std::string formatted_string = "";
@@ -145,8 +145,8 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::INT>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::INT>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::Int::DynamicCast(variant)->getValue() = std::stoi(string);
@@ -154,8 +154,8 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::FLOAT>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::FLOAT>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::Float::DynamicCast(variant)->getValue() = std::stof(string);
@@ -163,8 +163,8 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::DOUBLE>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::DOUBLE>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::Double::DynamicCast(variant)->getValue() = std::stod(string);
@@ -172,8 +172,8 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::BOOL>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::BOOL>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::Bool::DynamicCast(variant)->getValue() = string == "true";
@@ -181,8 +181,8 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::STRING>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::STRING>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::String::DynamicCast(variant)->getValue() = string;
@@ -190,18 +190,18 @@ namespace armarx::aron::component_config::products
template <>
void
- products::PropertyHelper<type::Descriptor::INT_ENUM>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
- const std::string& string) const
+ products::VariantHelper<type::Descriptor::INT_ENUM>::set_value_from_string(const armarx::aron::data::VariantPtr& variant,
+ const std::string& string) const
{
ARMARX_TRACE;
data::Int::DynamicCast(variant)->getValue() = std::stoi(string);
}
- template struct products::PropertyHelper<type::Descriptor::INT>;
- template struct products::PropertyHelper<type::Descriptor::STRING>;
- template struct products::PropertyHelper<type::Descriptor::BOOL>;
- template struct products::PropertyHelper<type::Descriptor::FLOAT>;
- template struct products::PropertyHelper<type::Descriptor::DOUBLE>;
- template struct products::PropertyHelper<type::Descriptor::INT_ENUM>;
+ template struct products::VariantHelper<type::Descriptor::INT>;
+ template struct products::VariantHelper<type::Descriptor::STRING>;
+ template struct products::VariantHelper<type::Descriptor::BOOL>;
+ template struct products::VariantHelper<type::Descriptor::FLOAT>;
+ template struct products::VariantHelper<type::Descriptor::DOUBLE>;
+ template struct products::VariantHelper<type::Descriptor::INT_ENUM>;
}
\ No newline at end of file
diff --git a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.h b/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h
similarity index 62%
rename from source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.h
rename to source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h
index f04b9c1fc..d2dfb921a 100644
--- a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/PropertyHelper.h
+++ b/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h
@@ -31,13 +31,13 @@ namespace armarx::aron::component_config
{
namespace factories
{
- struct PropertyHelper : armarx::Factory<PropertyHelper, type::Descriptor>
+ struct VariantHelper : armarx::Factory<VariantHelper, type::Descriptor>
{
- explicit PropertyHelper(Key)
+ explicit VariantHelper(Key)
{
};
- virtual ~PropertyHelper() = default;
+ virtual ~VariantHelper() = default;
virtual std::string to_string(const armarx::aron::data::VariantPtr&) const = 0;
@@ -50,12 +50,12 @@ namespace armarx::aron::component_config
namespace products
{
template <type::Descriptor DescT>
- struct PropertyHelper : factories::PropertyHelper::Registrar<PropertyHelper<DescT>>
+ struct VariantHelper : factories::VariantHelper::Registrar<VariantHelper<DescT>>
{
- using RegistrarT = factories::PropertyHelper::Registrar<PropertyHelper<DescT>>;
+ using RegistrarT = factories::VariantHelper::Registrar<VariantHelper<DescT>>;
static constexpr type::Descriptor id = DescT;
- explicit PropertyHelper() : RegistrarT(typename RegistrarT::Registration())
+ explicit VariantHelper() : RegistrarT(typename RegistrarT::Registration())
{
};
@@ -73,87 +73,87 @@ namespace armarx::aron::component_config
template <>
std::string
- products::PropertyHelper<type::Descriptor::INT>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::INT>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::INT>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::INT>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::INT>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::INT>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
template <>
std::string
- products::PropertyHelper<type::Descriptor::FLOAT>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::FLOAT>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::FLOAT>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::FLOAT>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::FLOAT>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::FLOAT>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
template <>
std::string
- products::PropertyHelper<type::Descriptor::BOOL>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::BOOL>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::BOOL>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::BOOL>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::BOOL>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::BOOL>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
template <>
std::string
- products::PropertyHelper<type::Descriptor::STRING>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::STRING>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::STRING>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::STRING>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::STRING>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::STRING>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
template <>
std::string
- products::PropertyHelper<type::Descriptor::DOUBLE>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::DOUBLE>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::DOUBLE>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::DOUBLE>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::DOUBLE>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::DOUBLE>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
template <>
std::string
- products::PropertyHelper<type::Descriptor::INT_ENUM>::to_string(const data::VariantPtr& ptr) const;
+ products::VariantHelper<type::Descriptor::INT_ENUM>::to_string(const data::VariantPtr& ptr) const;
template <>
aron::data::VariantPtr
- products::PropertyHelper<type::Descriptor::INT_ENUM>::from_string(const std::string&,
- const armarx::aron::Path& path) const;
+ products::VariantHelper<type::Descriptor::INT_ENUM>::from_string(const std::string&,
+ const armarx::aron::Path& path) const;
template <>
void
- products::PropertyHelper<type::Descriptor::INT_ENUM>::set_value_from_string(const armarx::aron::data::VariantPtr&,
- const std::string&) const;
+ products::VariantHelper<type::Descriptor::INT_ENUM>::set_value_from_string(const armarx::aron::data::VariantPtr&,
+ const std::string&) const;
static inline const std::list<type::Descriptor> implementedListDescriptors = {
@@ -164,11 +164,11 @@ namespace armarx::aron::component_config
type::Descriptor::DOUBLE,
type::Descriptor::BOOL,
};
- extern template struct products::PropertyHelper<type::Descriptor::INT>;
- extern template struct products::PropertyHelper<type::Descriptor::FLOAT>;
- extern template struct products::PropertyHelper<type::Descriptor::DOUBLE>;
- extern template struct products::PropertyHelper<type::Descriptor::STRING>;
- extern template struct products::PropertyHelper<type::Descriptor::BOOL>;
- extern template struct products::PropertyHelper<type::Descriptor::INT_ENUM>;
+ extern template struct products::VariantHelper<type::Descriptor::INT>;
+ extern template struct products::VariantHelper<type::Descriptor::FLOAT>;
+ extern template struct products::VariantHelper<type::Descriptor::DOUBLE>;
+ extern template struct products::VariantHelper<type::Descriptor::STRING>;
+ extern template struct products::VariantHelper<type::Descriptor::BOOL>;
+ extern template struct products::VariantHelper<type::Descriptor::INT_ENUM>;
}
--
GitLab