From a5907ccbdb0dae2fc03e5d134bce4ebfe56ba7d6 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 4 Sep 2019 12:56:21 +0200
Subject: [PATCH] Swap order of lenght and radius in drawCylinder() to be
consistent
---
.../core/visualization/DebugDrawerTopic.cpp | 15 +++++++++------
.../core/visualization/DebugDrawerTopic.h | 8 ++++----
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.cpp b/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.cpp
index 4859e7c33..ad714afa3 100644
--- a/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.cpp
+++ b/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.cpp
@@ -206,9 +206,11 @@ namespace armarx
}
- void DebugDrawerTopic::drawCylinder(const DebugDrawerTopic::VisuID& id,
- const Eigen::Vector3f& center, const Eigen::Vector3f& direction, float radius, float length,
- const DrawColor& color, bool ignoreLengthScale)
+ void DebugDrawerTopic::drawCylinder(
+ const DebugDrawerTopic::VisuID& id,
+ const Eigen::Vector3f& center, const Eigen::Vector3f& direction,
+ float length, float radius,
+ const DrawColor& color, bool ignoreLengthScale)
{
if (enabled())
{
@@ -219,9 +221,10 @@ namespace armarx
}
void DebugDrawerTopic::drawCylinder(
- const DebugDrawerTopic::VisuID& id,
- const Eigen::Vector3f& center, const Eigen::Quaternionf& orientation, float radius, float length,
- const DrawColor& color, bool ignoreLengthScale)
+ const DebugDrawerTopic::VisuID& id,
+ const Eigen::Vector3f& center, const Eigen::Quaternionf& orientation,
+ float length, float radius,
+ const DrawColor& color, bool ignoreLengthScale)
{
drawCylinder(id, center, orientation * Eigen::Vector3f::UnitY(), radius, length, color,
ignoreLengthScale);
diff --git a/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.h b/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.h
index 4b68eaa89..eba4ec519 100644
--- a/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.h
+++ b/source/RobotAPI/libraries/core/visualization/DebugDrawerTopic.h
@@ -330,22 +330,22 @@ namespace armarx
/**
* @brief Draw a cylinder with center and direction.
- * @param length the full length (not half-length)
+ * @param length The full length (not half-length).
*/
void drawCylinder(
const VisuID& id,
- const Eigen::Vector3f& center, const Eigen::Vector3f& direction, float radius, float length,
+ const Eigen::Vector3f& center, const Eigen::Vector3f& direction, float length, float radius,
const DrawColor& color = DEFAULTS.colorCylinder,
bool ignoreLengthScale = false);
/**
* @brief Draw a cylinder with center and orientation.
* An identity orientation represents a cylinder with an axis aligned to the Y-axis.
- * @param length the full length (not half-length)
+ * @param length The full length (not half-length).
*/
void drawCylinder(
const VisuID& id,
- const Eigen::Vector3f& center, const Eigen::Quaternionf& orientation, float radius, float length,
+ const Eigen::Vector3f& center, const Eigen::Quaternionf& orientation, float length, float radius,
const DrawColor& color = DEFAULTS.colorCylinder,
bool ignoreLengthScale = false);
--
GitLab