From 882080163236eea05b2ea9d5f689d09490c0ad66 Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Tue, 22 Sep 2020 08:54:53 +0200 Subject: [PATCH] Rename one method to fileByArm(), add overload taking RobotArm --- .../components/ArViz/Client/elements/RobotHand.cpp | 9 +++++++-- .../components/ArViz/Client/elements/RobotHand.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/RobotAPI/components/ArViz/Client/elements/RobotHand.cpp b/source/RobotAPI/components/ArViz/Client/elements/RobotHand.cpp index 248ace574..ea0966ff1 100644 --- a/source/RobotAPI/components/ArViz/Client/elements/RobotHand.cpp +++ b/source/RobotAPI/components/ArViz/Client/elements/RobotHand.cpp @@ -16,16 +16,21 @@ namespace armarx::viz RobotHand& RobotHand::fileBySide(const std::string& side, const RobotNameHelper& nameHelper) { RobotNameHelper::Arm arm = nameHelper.getArm(side); - return this->fileBySide(arm); + return this->fileByArm(arm); } - RobotHand& RobotHand::fileBySide(const RobotNameHelper::Arm& arm) + RobotHand& RobotHand::fileByArm(const RobotNameHelper::Arm& arm) { this->arm = arm; this->file(arm.getHandModelPackage(), arm.getHandModelPath()); return *this; } + RobotHand& RobotHand::fileByArm(const RobotNameHelper::RobotArm& arm) + { + return this->fileByArm(arm.getArm()); + } + RobotHand& RobotHand::tcpPose(const Eigen::Matrix4f& tcpPose, VirtualRobot::RobotPtr robot) { ARMARX_CHECK(arm) << "Set RobotHand::side() before setting the TCP pose."; diff --git a/source/RobotAPI/components/ArViz/Client/elements/RobotHand.h b/source/RobotAPI/components/ArViz/Client/elements/RobotHand.h index f6d3c549c..0a6e7d4a4 100644 --- a/source/RobotAPI/components/ArViz/Client/elements/RobotHand.h +++ b/source/RobotAPI/components/ArViz/Client/elements/RobotHand.h @@ -32,7 +32,8 @@ namespace armarx::viz */ RobotHand& fileBySide(const std::string& side, RobotInfoNodePtr robotInfo); RobotHand& fileBySide(const std::string& side, const RobotNameHelper& nameHelper); - RobotHand& fileBySide(const RobotNameHelper::Arm& arm); + RobotHand& fileByArm(const RobotNameHelper::Arm& arm); + RobotHand& fileByArm(const RobotNameHelper::RobotArm& arm); /** -- GitLab