Skip to content
Snippets Groups Projects
Commit 7ef0a5ab authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

update type representation in skills. Fix time values of commit

parent 68dd450e
No related branches found
No related tags found
2 merge requests!337Merge fabianpk dev branch,!334Use datatype object to display accepted types in armem_gui. Fix time values for commit.
......@@ -13,6 +13,7 @@ armarx_add_library(
RobotAPI::armem_server
RobotAPI::skills
aronjsonconverter
aroncommonconverter
SOURCES
./aron_conversions.cpp
......
......@@ -31,11 +31,11 @@ The memory should look like the following:
</ObjectChild>
<ObjectChild key='timeoutMs'>
<long />
<int64 />
</ObjectChild>
<ObjectChild key='acceptedType'>
<string /> <!-- TODO REPLACE! -->
<AnyObject shared_ptr="1" />
</ObjectChild>
</Object>
......
......@@ -4,6 +4,7 @@
#include <SimoxUtility/algorithm/string.h>
#include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h>
#include <RobotAPI/libraries/aron/converter/common/DatatypeConverter.h>
#include <RobotAPI/libraries/armem_skills/aron/Skill.aron.generated.h>
......@@ -43,13 +44,19 @@ namespace armarx::skills::segment
if (desc.acceptedType)
{
auto t = aron::type::Object::FromAronObjectDTO(desc.acceptedType);
skillDescription.acceptedType = aron::converter::AronNlohmannJSONConverter::ConvertToNlohmannJSON(t).dump(2);
aron::converter::DatatypeConverter c;
aron::type::visit(c, t);
skillDescription.acceptedType = aron::data::Dict::DynamicCastAndCheck(c.latest);
}
armem::Commit commit;
auto& entityUpdate = commit.add();
entityUpdate.confidence = 1.0;
entityUpdate.timeCreated = armem::Time::Now();
entityUpdate.referencedTime = armem::Time::Now();
entityUpdate.sentTime = armem::Time::Now();
entityUpdate.arrivedTime = armem::Time::Now();
entityUpdate.instancesData = {skillDescription.toAron()};
entityUpdate.entityID = provId.withEntityName(skillDescription.skillName);
......
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