Skip to content
Snippets Groups Projects
Commit c89928dc authored by SecondHandsIntegrationAccount's avatar SecondHandsIntegrationAccount
Browse files

fixed agent field in framedpose etc.

parent 959aa830
No related branches found
No related tags found
No related merge requests found
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @package * @package
* @author * @author
* @date * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License * GNU General Public License
*/ */
...@@ -91,6 +91,7 @@ namespace armarx ...@@ -91,6 +91,7 @@ namespace armarx
result->y = newVec(1); result->y = newVec(1);
result->z = newVec(2); result->z = newVec(2);
result->frame = newFrame; result->frame = newFrame;
result->agent = robot->getName();
return result; return result;
} }
...@@ -135,6 +136,7 @@ namespace armarx ...@@ -135,6 +136,7 @@ namespace armarx
y = newVec(1); y = newVec(1);
z = newVec(2); z = newVec(2);
frame = newFrame; frame = newFrame;
agent = robot->getName();
} }
void FramedDirection::changeToGlobal(const SharedRobotInterfacePrx& referenceRobot) void FramedDirection::changeToGlobal(const SharedRobotInterfacePrx& referenceRobot)
...@@ -359,6 +361,7 @@ namespace armarx ...@@ -359,6 +361,7 @@ namespace armarx
Eigen::Vector3f pos = newPose.block<3, 1>(0, 3); Eigen::Vector3f pos = newPose.block<3, 1>(0, 3);
position = new Vector3(pos); position = new Vector3(pos);
frame = newFrame; frame = newFrame;
agent = referenceRobot->getName();
init(); init();
} }
...@@ -569,6 +572,7 @@ namespace armarx ...@@ -569,6 +572,7 @@ namespace armarx
x = pos[0]; x = pos[0];
y = pos[1]; y = pos[1];
z = pos[2]; z = pos[2];
agent = referenceRobot->getName();
frame = newFrame; frame = newFrame;
} }
...@@ -765,6 +769,7 @@ namespace armarx ...@@ -765,6 +769,7 @@ namespace armarx
qx = quat.x(); qx = quat.x();
qy = quat.y(); qy = quat.y();
qz = quat.z(); qz = quat.z();
agent = referenceRobot->getName();
frame = newFrame; frame = newFrame;
} }
......
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