Skip to content
Snippets Groups Projects

Fix bugs in ArMem and make disk loading and storing nicer

Merged Rainer Kartmann requested to merge armem/fixes into armem/dev
1 file
+ 22
2
Compare changes
  • Side-by-side
  • Inline
@@ -3,6 +3,7 @@
#include "RemoteGuiAronDataVisitor.h"
#include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
#include <RobotAPI/libraries/aron/core/navigator/type/container/Object.h>
#include <RobotAPI/libraries/aron/core/navigator/visitors/DataVisitor.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
@@ -32,11 +33,27 @@ namespace armarx::armem::server
return group;
}
static std::string getTypeString(const armem::base::detail::AronTyped& typed)
{
std::stringstream type;
if (typed.aronType())
{
type << " (" << typed.aronType()->getName() << ")";
}
else
{
type << " (no Aron type)";
}
return type.str();
}
template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::CoreSegmentBase<Args...>& coreSegment) const
{
GroupBox group;
group.setLabel(makeGroupLabel("Core Segment", coreSegment.name(), coreSegment.size()));
group.setLabel(makeGroupLabel("Core Segment", coreSegment.name(), coreSegment.size())
+ getTypeString(coreSegment));
if (coreSegment.empty())
{
@@ -49,11 +66,13 @@ namespace armarx::armem::server
return group;
}
template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::ProviderSegmentBase<Args...>& providerSegment) const
{
GroupBox group;
group.setLabel(makeGroupLabel("Provider Segment", providerSegment.name(), providerSegment.size()));
group.setLabel(makeGroupLabel("Provider Segment", providerSegment.name(), providerSegment.size())
+ getTypeString(providerSegment));
if (providerSegment.empty())
{
@@ -66,6 +85,7 @@ namespace armarx::armem::server
return group;
}
template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::EntityBase<Args...>& entity) const
{
Loading