From c89928dc2af38eefa6771ecc331e53d5b8a72753 Mon Sep 17 00:00:00 2001
From: SecondHandsIntegrationAccount <NotAvailable@secondhands.eu>
Date: Wed, 13 Jul 2016 19:10:48 +0200
Subject: [PATCH] fixed agent field in framedpose etc.
---
source/RobotAPI/libraries/core/FramedPose.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/libraries/core/FramedPose.cpp b/source/RobotAPI/libraries/core/FramedPose.cpp
index fe3c74ffa..9f30be503 100644
--- a/source/RobotAPI/libraries/core/FramedPose.cpp
+++ b/source/RobotAPI/libraries/core/FramedPose.cpp
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * @package
- * @author
- * @date
+ * @package
+ * @author
+ * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
@@ -91,6 +91,7 @@ namespace armarx
result->y = newVec(1);
result->z = newVec(2);
result->frame = newFrame;
+ result->agent = robot->getName();
return result;
}
@@ -135,6 +136,7 @@ namespace armarx
y = newVec(1);
z = newVec(2);
frame = newFrame;
+ agent = robot->getName();
}
void FramedDirection::changeToGlobal(const SharedRobotInterfacePrx& referenceRobot)
@@ -359,6 +361,7 @@ namespace armarx
Eigen::Vector3f pos = newPose.block<3, 1>(0, 3);
position = new Vector3(pos);
frame = newFrame;
+ agent = referenceRobot->getName();
init();
}
@@ -569,6 +572,7 @@ namespace armarx
x = pos[0];
y = pos[1];
z = pos[2];
+ agent = referenceRobot->getName();
frame = newFrame;
}
@@ -765,6 +769,7 @@ namespace armarx
qx = quat.x();
qy = quat.y();
qz = quat.z();
+ agent = referenceRobot->getName();
frame = newFrame;
}
--
GitLab