From 51ec0c307eb062463ab6c081fa021eb23fa01288 Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Wed, 15 Feb 2023 17:56:11 +0000
Subject: [PATCH] Revert "Many fixes & refactoring & add Quaternions"
This reverts commit d7f046dd1d9c0cbac339a1ae8f5963db1617a707.
---
.../SkillProviderExample/SkillProviderExample.cpp | 2 ++
.../aron/HelloWorldAcceptedType.xml | 11 +++++++++++
.../SkillManagerMonitorWidgetController.cpp | 13 +++++++++----
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp b/source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp
index bc50155ed..985ef8171 100644
--- a/source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp
+++ b/source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp
@@ -20,6 +20,8 @@ namespace armarx::skills::provider
default_params.some_float = 5;
default_params.some_int = 42;
default_params.some_text = "YOLO";
+ default_params.some_list_of_matrices.push_back(Eigen::Matrix3f::Zero());
+ //default_params.some_matrix = Eigen::Matrix3f::Zero();
return SkillDescription{
"HelloWorld",
diff --git a/source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml b/source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
index 553a93ad0..1a663e5e4 100644
--- a/source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
+++ b/source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
@@ -11,6 +11,17 @@
<ObjectChild key='some_text'>
<String />
</ObjectChild>
+
+ <ObjectChild key='some_list_of_matrices'>
+ <List>
+ <Matrix rows="3" cols="3" type="float32" />
+ </List>
+ </ObjectChild>
+
+ <!--<ObjectChild key='some_matrix'>
+ <Matrix rows="3" cols="3" type="float32" />
+ </ObjectChild>-->
+
</Object>
</GenerateTypes>
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
index 0811cfffe..eba6a0e3d 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
@@ -267,10 +267,15 @@ namespace armarx
QTreeWidgetItem* skillItem = item->child(j);
skills::SkillID currentSkillId(providerName, skillItem->text(0).toStdString());
- skillItem->setText(2,
- QString::fromStdString(ExecutionStatus2String.at(
- statusForSkill.header.status)));
- }
+
+ auto statusForSkill = allStatusesForProvider.at(currentSkillId.skillName);
+ skillItem->setText(2, QString::fromStdString(ExecutionStatus2String.at(statusForSkill.header.status)));
+
+ if (not statusForSkill.header.executorName.empty()) // it means that the skill was called by someone
+ {
+ activeSkillsAndPrefixes.insert({currentSkillId, statusForSkill.header.executorName});
+ }
+ }
}
catch (const std::exception& e)
{
--
GitLab