Skip to content
Snippets Groups Projects
Commit dc15830d authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Show type in Remote Gui

parent 7aac1404
No related branches found
No related tags found
2 merge requests!192Fix bugs in ArMem and make disk loading and storing nicer,!188ArMem Updates
This commit is part of merge request !192. Comments created here will be created in the context of that merge request.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include "RemoteGuiAronDataVisitor.h" #include "RemoteGuiAronDataVisitor.h"
#include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.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 <RobotAPI/libraries/aron/core/navigator/visitors/DataVisitor.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h> #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
...@@ -32,11 +33,27 @@ namespace armarx::armem::server ...@@ -32,11 +33,27 @@ namespace armarx::armem::server
return group; 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> template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::CoreSegmentBase<Args...>& coreSegment) const MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::CoreSegmentBase<Args...>& coreSegment) const
{ {
GroupBox group; 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()) if (coreSegment.empty())
{ {
...@@ -49,11 +66,13 @@ namespace armarx::armem::server ...@@ -49,11 +66,13 @@ namespace armarx::armem::server
return group; return group;
} }
template <class ...Args> template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::ProviderSegmentBase<Args...>& providerSegment) const MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::ProviderSegmentBase<Args...>& providerSegment) const
{ {
GroupBox group; 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()) if (providerSegment.empty())
{ {
...@@ -66,6 +85,7 @@ namespace armarx::armem::server ...@@ -66,6 +85,7 @@ namespace armarx::armem::server
return group; return group;
} }
template <class ...Args> template <class ...Args>
MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::EntityBase<Args...>& entity) const MemoryRemoteGui::GroupBox MemoryRemoteGui::_makeGroupBox(const armem::base::EntityBase<Args...>& entity) const
{ {
......
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