diff --git a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp index d0f2f4c77863e680bc644a219370a41aac8f4a79..f80717342b3bc98dc1ebf9b7a72a4b274ede768a 100644 --- a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp +++ b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp @@ -4,10 +4,10 @@ #include <ArmarXCore/core/logging/Logging.h> -#include <RobotAPI/libraries/aron/core/data/variant/All.h> -#include <RobotAPI/libraries/aron/core/Exception.h> #include <RobotAPI/libraries/armem/core/Time.h> #include <RobotAPI/libraries/aron/converter/eigen/EigenConverter.h> +#include <RobotAPI/libraries/aron/core/Exception.h> +#include <RobotAPI/libraries/aron/core/data/variant/All.h> namespace armarx::armem::gui::instance { @@ -27,6 +27,34 @@ namespace armarx::armem::gui::instance return obj; } + /* We override this method because we need to handle untyped members in the hierarchy. + * The other get*Elements() methods will either not be called with a null type or can handle it. + */ + TreeTypedJSONConverter::MapElements + TreeTypedJSONConverter::getObjectElements(DataInput& elementData, TypeInput& elementType) + { + std::map<std::string, std::pair<aron::data::VariantPtr, aron::type::VariantPtr>> ret; + auto data = aron::data::Dict::DynamicCastAndCheck(elementData); + auto type = aron::type::Object::DynamicCastAndCheck(elementType); + + if (data) + { + for (const auto& [key, e] : data->getElements()) + { + if (type && type->hasMemberType(key)) + { + auto memberType = type->getMemberType(key); + ret.insert({key, {e, memberType}}); + } + else + { + ret.insert({key, {e, nullptr}}); + } + } + } + return ret; + } + void TreeTypedJSONConverter::visitObjectOnEnter(DataInput& elementData, TypeInput& /*elementType*/) { diff --git a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h index 7a112979e7baa9e01460cc98d00c3d74a0d846e5..901021de0b67a556cf5adcc62635ebee8704d9d9 100644 --- a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h +++ b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h @@ -17,6 +17,8 @@ namespace armarx::armem::gui::instance const nlohmann::json& getJSON(); + MapElements getObjectElements(DataInput& elementData, TypeInput& elementType) override; + void visitObjectOnEnter(DataInput& elementData, TypeInput& elementType) override; void visitObjectOnExit(DataInput& elementData, TypeInput& elementType) override; void visitDictOnEnter(DataInput& elementData, TypeInput& elementType) override;