Skip to content
Snippets Groups Projects

Feature/navigator human reader

Merged Fabian Reister requested to merge feature/navigator-human-reader into dev
7 files
+ 63
34
Compare changes
  • Side-by-side
  • Inline
Files
7
@@ -56,7 +56,7 @@
#include <ArmarXCore/libraries/DecoupledSingleComponent/Decoupled.h>
#include <ArmarXCore/util/CPPUtility/trace.h>
#include "ArmarXGui/libraries/RemoteGui/Client/Widgets.h"
#include <ArmarXGui/libraries/RemoteGui/Client/Widgets.h>
#include <RobotAPI/components/ArViz/Client/Client.h>
#include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerRegistry.h>
@@ -66,8 +66,9 @@
#include <RobotAPI/libraries/armem_vision/client/occupancy_grid/Reader.h>
#include <RobotAPI/libraries/core/remoterobot/RemoteRobot.h>
#include "armarx/navigation/server/execution/ExecutorInterface.h"
#include "armarx/navigation/server/scene_provider/SceneProvider.h"
#include <armarx/navigation/memory/client/costmap/Reader.h>
#include <armarx/navigation/server/execution/ExecutorInterface.h>
#include <armarx/navigation/server/scene_provider/SceneProvider.h>
#include <armarx/navigation/algorithms/Costmap.h>
#include <armarx/navigation/algorithms/CostmapBuilder.h>
#include <armarx/navigation/algorithms/astar/util.h>
@@ -123,6 +124,7 @@ namespace armarx::navigation::components::navigator
addPlugin(resultsWriterPlugin);
addPlugin(graphReaderPlugin);
addPlugin(costmapReaderPlugin);
addPlugin(humanReaderPlugin);
addPlugin(virtualRobotReaderPlugin);
@@ -164,6 +166,7 @@ namespace armarx::navigation::components::navigator
.graphReader = &graphReaderPlugin->get(),
.costmapReader = &costmapReaderPlugin->get(),
.virtualRobotReader = &virtualRobotReaderPlugin->get(),
.humanReader = &humanReaderPlugin->get(),
.objectPoseClient = ObjectPoseClientPluginUser::getClient()};
const std::string robotName = getControlComponentPlugin()
@@ -190,7 +193,7 @@ namespace armarx::navigation::components::navigator
// memoryIntrospector = server::MemoryIntrospector(resultsWriterPlugin->get(), );
navRemoteGui = std::make_unique<navigator::RemoteGui>(remoteGui, *this);
navRemoteGui.emplace(remoteGui, *this);
navRemoteGui->enable();
initialized = true;
Loading