Skip to content
Snippets Groups Projects

armem/dev => master

Merged Fabian Reister requested to merge armem/dev into master
2 files
+ 15
1
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -67,7 +67,15 @@ 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 << "'";
auto robot = VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
return VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
}
VirtualRobot::RobotPtr VirtualRobotReader::getSynchronizedRobot(const std::string& name,
const armem::Time& timestamp,
const VirtualRobot::RobotIO::RobotDescription& loadMode)
{
auto robot = getRobot(name, timestamp);
synchronizeRobot(*robot, timestamp);
Loading