Skip to content
Snippets Groups Projects

armem/dev => master

Merged Fabian Reister requested to merge armem/dev into master
1 file
+ 6
1
Compare changes
  • Side-by-side
  • Inline
@@ -6,6 +6,7 @@
#include <VirtualRobot/XML/RobotIO.h>
#include "ArmarXCore/core/PackagePath.h"
#include "ArmarXCore/core/logging/Logging.h"
#include "ArmarXCore/core/system/ArmarXDataPath.h"
#include "ArmarXCore/core/system/cmake/CMakePackageFinder.h"
@@ -41,6 +42,7 @@ namespace armarx::armem::robot_state
const auto robotState = queryState(robotDescription, timestamp);
if (not robotState)
{
ARMARX_WARNING << "Querying robot state failed!";
return false;
}
@@ -65,8 +67,11 @@ namespace armarx::armem::robot_state
const std::string xmlFilename = ArmarXDataPath::resolvePath(description->xml.serialize().path);
ARMARX_INFO << "Loading (virtual) robot '" << description->name << "' from XML file '" << xmlFilename << "'";
return VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
auto robot = VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
synchronizeRobot(*robot, timestamp);
return robot;
}
Loading