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

formatting and -verbosity

parent 60650331
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,6 @@
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
#include <ArmarXCore/core/time/Clock.h>
namespace armarx::armem::robot_state
{
......@@ -41,14 +40,14 @@ namespace armarx::armem::robot_state
// const static auto packages = armarx::CMakePackageFinder::FindAllArmarXSourcePackages();
// const auto package = armarx::ArmarXDataPath::getProject(packages, robot.getFilename());
const robot::RobotDescription robotDescription{
.name = robot.getName(), .xml = PackagePath{"", ""}};
const robot::RobotDescription robotDescription{.name = robot.getName(),
.xml = PackagePath{"", ""}};
const auto robotState = queryState(robotDescription, timestamp);
if (not robotState)
{
ARMARX_VERBOSE << "Querying robot state failed for robot `" << robot.getName() << "` "
<< "(type `"<< robot.getType() << "`)!";
<< "(type `" << robot.getType() << "`)!";
return false;
}
......@@ -63,8 +62,8 @@ namespace armarx::armem::robot_state
const armem::Time& timestamp,
const VirtualRobot::RobotIO::RobotDescription& loadMode)
{
ARMARX_INFO << deactivateSpam(60)
<< "Querying robot description for robot '" << name << "'";
ARMARX_VERBOSE << deactivateSpam(60) << "Querying robot description for robot '" << name
<< "'";
const auto description = queryDescription(name, timestamp);
if (not description)
......@@ -77,8 +76,8 @@ namespace armarx::armem::robot_state
const std::string xmlFilename = description->xml.toSystemPath();
ARMARX_CHECK(std::filesystem::exists(xmlFilename)) << xmlFilename;
ARMARX_INFO << "Loading (virtual) robot '" << description->name << "' from XML file '"
<< xmlFilename << "'";
ARMARX_VERBOSE << "Loading (virtual) robot '" << description->name << "' from XML file '"
<< xmlFilename << "'";
auto robot = VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
ARMARX_CHECK_NOT_NULL(robot) << "Could not load robot from file `" << xmlFilename << "`";
......@@ -88,17 +87,14 @@ namespace armarx::armem::robot_state
return robot;
}
VirtualRobot::RobotPtr
VirtualRobotReader::getSynchronizedRobot(
const std::string& name,
const VirtualRobot::BaseIO::RobotDescription& loadMode,
bool blocking)
VirtualRobotReader::getSynchronizedRobot(const std::string& name,
const VirtualRobot::BaseIO::RobotDescription& loadMode,
bool blocking)
{
return _getSynchronizedRobot(name, armem::Time::Invalid(), loadMode, blocking);
}
VirtualRobot::RobotPtr
VirtualRobotReader::getSynchronizedRobot(
const std::string& name,
......@@ -109,13 +105,12 @@ namespace armarx::armem::robot_state
return _getSynchronizedRobot(name, timestamp, loadMode, blocking);
}
VirtualRobot::RobotPtr
VirtualRobotReader::_getSynchronizedRobot(
const std::string& name,
const Time& timestamp,
const VirtualRobot::BaseIO::RobotDescription& loadMode,
bool blocking)
const std::string& name,
const Time& timestamp,
const VirtualRobot::BaseIO::RobotDescription& loadMode,
bool blocking)
{
while (blocking)
{
......
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