Skip to content
Snippets Groups Projects
Commit 9577e13b authored by Your Name's avatar Your Name
Browse files

cleanup

parent 3c369598
No related branches found
No related tags found
No related merge requests found
......@@ -27,12 +27,6 @@
#include <SimoxUtility/algorithm/string/string_tools.h>
#include <VirtualRobot/MathTools.h>
// Include headers you only need in function definitions in the .cpp.
// #include <Eigen/Core>
// #include <SimoxUtility/color/Color.h>
#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
#include "ArmarXCore/core/logging/Logging.h"
#include "ArmarXCore/core/time.h"
......@@ -69,8 +63,10 @@ namespace armarx::manipulation::components::tof_based_grasping
constexpr float maxDistanceValid = 150; // FIXME magic number
constexpr float distanceGraspThreshold = 40; // FIXME magic number
const MaskMatrixType tofLeftMask = tofLeft->array.array() > minDistanceValid and tofLeft->array.array() < maxDistanceValid;
const MaskMatrixType tofRightMask = tofRight->array.array() > minDistanceValid and tofRight->array.array() < maxDistanceValid;
const MaskMatrixType tofLeftMask = tofLeft->array.array() > minDistanceValid and
tofLeft->array.array() < maxDistanceValid;
const MaskMatrixType tofRightMask = tofRight->array.array() > minDistanceValid and
tofRight->array.array() < maxDistanceValid;
draw(core::Hand::Left, tofLeft.value(), tofLeftMask);
draw(core::Hand::Right, tofRight.value(), tofRightMask);
......@@ -94,9 +90,9 @@ namespace armarx::manipulation::components::tof_based_grasping
}
// eventually, remove thumb circumduction
for(const auto& name: simox::alg::get_keys(jointValues))
for (const auto& name : simox::alg::get_keys(jointValues))
{
if(simox::alg::ends_with(name, "ThumbCircumduction"))
if (simox::alg::ends_with(name, "ThumbCircumduction"))
{
jointValues.erase(name);
}
......@@ -126,7 +122,7 @@ namespace armarx::manipulation::components::tof_based_grasping
{
for (std::size_t py = 0; py < static_cast<std::size_t>(tof.array.rows()); py++)
{
if(not mask(px, py))
if (not mask(px, py))
{
continue;
}
......
......@@ -24,15 +24,9 @@
#pragma once
// #include <mutex>
#include "ArmarXCore/core/services/tasks/RunningTask.h"
#include <ArmarXCore/core/Component.h>
// #include <ArmarXCore/libraries/ArmarXCoreComponentPlugins/DebugObserverComponentPlugin.h>
// #include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
// #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
#include "RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h"
#include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
#include <RobotAPI/libraries/armem/client/plugins.h>
......@@ -100,6 +94,7 @@ namespace armarx::manipulation::components::tof_based_grasping
{
std::string robotName;
};
Properties properties;
......
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