Skip to content
Snippets Groups Projects
Commit a9559e49 authored by Fabian Reister's avatar Fabian Reister
Browse files

distinguishing between getRobot and getSynchronizedRobot

parent 4fb829bf
No related branches found
No related tags found
2 merge requests!157armem/dev => master,!154armem_robot_state: updates
This commit is part of merge request !157. Comments created here will be created in the context of that merge request.
......@@ -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);
......
......@@ -53,6 +53,12 @@ namespace armarx::armem::robot_state
const armem::Time& timestamp,
const VirtualRobot::RobotIO::RobotDescription& loadMode =
VirtualRobot::RobotIO::RobotDescription::eStructure);
VirtualRobot::RobotPtr
getSynchronizedRobot(const std::string& name,
const armem::Time& timestamp,
const VirtualRobot::RobotIO::RobotDescription& loadMode =
VirtualRobot::RobotIO::RobotDescription::eStructure);
};
} // namespace armarx::armem::robot_state
\ No newline at end of file
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