From 4de152fcd725cfa06380a86fdc282ae51eb18101 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 17 May 2023 11:58:38 +0200
Subject: [PATCH] Format
---
.../manager/SkillManagerComponentPlugin.cpp | 83 +++++++++++++------
1 file changed, 57 insertions(+), 26 deletions(-)
diff --git a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
index 60a38b465..38ca6ea50 100644
--- a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
@@ -1,20 +1,26 @@
#include "SkillManagerComponentPlugin.h"
#include <ArmarXCore/core/Component.h>
+
#include "../error/Exception.h"
namespace armarx::plugins
{
- void SkillManagerComponentPlugin::preOnInitComponent()
- {}
-
- void SkillManagerComponentPlugin::preOnConnectComponent()
- {}
+ void
+ SkillManagerComponentPlugin::preOnInitComponent()
+ {
+ }
- void SkillManagerComponentPlugin::postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties)
- {}
-}
+ void
+ SkillManagerComponentPlugin::preOnConnectComponent()
+ {
+ }
+ void
+ SkillManagerComponentPlugin::postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties)
+ {
+ }
+} // namespace armarx::plugins
namespace armarx
{
@@ -23,7 +29,9 @@ namespace armarx
addPlugin(plugin);
}
- void SkillManagerComponentPluginUser::addProvider(const skills::manager::dto::ProviderInfo& info, const Ice::Current&)
+ void
+ SkillManagerComponentPluginUser::addProvider(const skills::manager::dto::ProviderInfo& info,
+ const Ice::Current&)
{
std::lock_guard l(skillProviderMapMutex);
if (skillProviderMap.find(info.providerName) == skillProviderMap.end())
@@ -33,13 +41,16 @@ namespace armarx
}
else
{
- ARMARX_INFO << "Trying to add a provider with name '" << info.providerName << "' but the provider already exists. "
+ ARMARX_INFO << "Trying to add a provider with name '" << info.providerName
+ << "' but the provider already exists. "
<< "Overwriting the old provider info.";
skillProviderMap[info.providerName] = info.provider;
}
}
- void SkillManagerComponentPluginUser::removeProvider(const std::string& providerName, const Ice::Current&)
+ void
+ SkillManagerComponentPluginUser::removeProvider(const std::string& providerName,
+ const Ice::Current&)
{
std::lock_guard l(skillProviderMapMutex);
if (auto it = skillProviderMap.find(providerName); it != skillProviderMap.end())
@@ -49,11 +60,13 @@ namespace armarx
}
else
{
- ARMARX_INFO << "Trying to remove a provider with name '" << providerName << "' but it couldn't be found.";
+ ARMARX_INFO << "Trying to remove a provider with name '" << providerName
+ << "' but it couldn't be found.";
}
}
- std::string SkillManagerComponentPluginUser::getFirstProviderNameThatHasSkill(const std::string& skillName)
+ std::string
+ SkillManagerComponentPluginUser::getFirstProviderNameThatHasSkill(const std::string& skillName)
{
for (const auto& [providerName, providerPrx] : skillProviderMap)
{
@@ -69,14 +82,17 @@ namespace armarx
return "INVALID PROVIDER NAME";
}
- skills::provider::dto::SkillStatusUpdate SkillManagerComponentPluginUser::executeSkill(const skills::manager::dto::SkillExecutionRequest& info, const Ice::Current&)
+ skills::provider::dto::SkillStatusUpdate
+ SkillManagerComponentPluginUser::executeSkill(
+ const skills::manager::dto::SkillExecutionRequest& info,
+ const Ice::Current&)
{
std::string providerName = "INVALID PROVIDER NAME";
if (info.skillId.providerName == "*")
{
providerName = getFirstProviderNameThatHasSkill(info.skillId.skillName);
}
- else if(not(info.skillId.providerName.empty()))
+ else if (not(info.skillId.providerName.empty()))
{
providerName = info.skillId.providerName;
}
@@ -110,20 +126,28 @@ namespace armarx
std::scoped_lock l(skillProviderMapMutex);
if (auto it = skillProviderMap.find(providerName); it != skillProviderMap.end())
{
- ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '" << n << "' during execution. Removing it from skills.";
+ ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '"
+ << n << "' during execution. Removing it from skills.";
it = skillProviderMap.erase(it);
}
}
}
else
{
- ARMARX_ERROR << "Could not execute a skill of provider '" + providerName + "' because the provider does not exist.";
- throw skills::error::SkillException(__PRETTY_FUNCTION__, "Skill execution failed. Could not execute a skill of provider '" + providerName + "' because the provider does not exist.");
+ ARMARX_ERROR << "Could not execute a skill of provider '" + providerName +
+ "' because the provider does not exist.";
+ throw skills::error::SkillException(
+ __PRETTY_FUNCTION__,
+ "Skill execution failed. Could not execute a skill of provider '" + providerName +
+ "' because the provider does not exist.");
}
return {}; // Never happens
}
- void SkillManagerComponentPluginUser::abortSkill(const std::string& providerName, const std::string& skillName, const Ice::Current ¤t)
+ void
+ SkillManagerComponentPluginUser::abortSkill(const std::string& providerName,
+ const std::string& skillName,
+ const Ice::Current& current)
{
std::scoped_lock l(skillProviderMapMutex);
if (auto it = skillProviderMap.find(providerName); it != skillProviderMap.end())
@@ -142,13 +166,17 @@ namespace armarx
}
}
- void SkillManagerComponentPluginUser::updateStatusForSkill(const skills::provider::dto::SkillStatusUpdate& statusUpdate, const Ice::Current&)
+ void
+ SkillManagerComponentPluginUser::updateStatusForSkill(
+ const skills::provider::dto::SkillStatusUpdate& statusUpdate,
+ const Ice::Current&)
{
- (void) statusUpdate;
+ (void)statusUpdate;
// If you want to use the status, implement this method!
}
- skills::manager::dto::SkillDescriptionMapMap SkillManagerComponentPluginUser::getSkillDescriptions(const Ice::Current ¤t)
+ skills::manager::dto::SkillDescriptionMapMap
+ SkillManagerComponentPluginUser::getSkillDescriptions(const Ice::Current& current)
{
skills::manager::dto::SkillDescriptionMapMap ret;
@@ -165,14 +193,16 @@ namespace armarx
}
else
{
- ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '" << n << "'. Removing it from skills.";
+ ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '"
+ << n << "'. Removing it from skills.";
it = skillProviderMap.erase(it);
}
}
return ret;
}
- skills::manager::dto::SkillStatusUpdateMapMap SkillManagerComponentPluginUser::getSkillExecutionStatuses(const Ice::Current ¤t)
+ skills::manager::dto::SkillStatusUpdateMapMap
+ SkillManagerComponentPluginUser::getSkillExecutionStatuses(const Ice::Current& current)
{
skills::manager::dto::SkillStatusUpdateMapMap ret;
@@ -189,10 +219,11 @@ namespace armarx
}
else
{
- ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '" << n << "'. Removing it from skills.";
+ ARMARX_WARNING << __PRETTY_FUNCTION__ << ": Found disconnected skill provider '"
+ << n << "'. Removing it from skills.";
it = skillProviderMap.erase(it);
}
}
return ret;
}
-}
+} // namespace armarx
--
GitLab