Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[6449] pkg/trunk
|
From: <hsu...@us...> - 2008-11-08 05:00:48
|
Revision: 6449
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=6449&view=rev
Author: hsujohnhsu
Date: 2008-11-08 05:00:39 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
typecast ULL's to uint64_t.
Modified Paths:
--------------
pkg/trunk/nav/nav_view/src/nav_view/nav_view_panel.cpp
pkg/trunk/util/tf/include/tf/transform_datatypes.h
pkg/trunk/util/tf/include/tf/transform_listener.h
pkg/trunk/util/tf/src/tf.cpp
pkg/trunk/util/tf/test/testBroadcaster.cpp
Modified: pkg/trunk/nav/nav_view/src/nav_view/nav_view_panel.cpp
===================================================================
--- pkg/trunk/nav/nav_view/src/nav_view/nav_view_panel.cpp 2008-11-08 04:33:47 UTC (rev 6448)
+++ pkg/trunk/nav/nav_view/src/nav_view/nav_view_panel.cpp 2008-11-08 05:00:39 UTC (rev 6449)
@@ -429,7 +429,7 @@
{
try
{
- tf::Stamped<tf::Pose> robot_pose(btTransform(btQuaternion(0,0,0), btVector3(0,0,0)), ros::Time(0ULL), "base");
+ tf::Stamped<tf::Pose> robot_pose(btTransform(btQuaternion(0,0,0), btVector3(0,0,0)), ros::Time((uint64_t)0ULL), "base");
tf::Stamped<tf::Pose> map_pose;
tf_client_->transformPose("map", robot_pose, map_pose);
Modified: pkg/trunk/util/tf/include/tf/transform_datatypes.h
===================================================================
--- pkg/trunk/util/tf/include/tf/transform_datatypes.h 2008-11-08 04:33:47 UTC (rev 6448)
+++ pkg/trunk/util/tf/include/tf/transform_datatypes.h 2008-11-08 05:00:39 UTC (rev 6449)
@@ -66,7 +66,7 @@
std::string frame_id_;
std::string parent_id_; ///only used for transform
- Stamped() :stamp_ (0ULL),frame_id_ ("NO_ID"), parent_id_("NOT A TRANSFORM"){}; //Default constructor used only for preallocation
+ Stamped() :stamp_ ((uint64_t)0ULL),frame_id_ ("NO_ID"), parent_id_("NOT A TRANSFORM"){}; //Default constructor used only for preallocation
Stamped(const T& input, const ros::Time& timestamp, const std::string & frame_id, const std::string & parent_id = "NOT A TRANSFORM"):
T (input), stamp_ ( timestamp ), frame_id_ (frame_id), parent_id_(parent_id){ };
Modified: pkg/trunk/util/tf/include/tf/transform_listener.h
===================================================================
--- pkg/trunk/util/tf/include/tf/transform_listener.h 2008-11-08 04:33:47 UTC (rev 6448)
+++ pkg/trunk/util/tf/include/tf/transform_listener.h 2008-11-08 05:00:39 UTC (rev 6449)
@@ -154,7 +154,7 @@
// setWithEulers(tfArrayIn.eulers[i].header.frame_id, tfArrayIn.eulers[i].parent, tfArrayIn.eulers[i].x, tfArrayIn.eulers[i].y, tfArrayIn.eulers[i].z, tfArrayIn.eulers[i].yaw, tfArrayIn.eulers[i].pitch, tfArrayIn.eulers[i].roll, tfArrayIn.eulers[i].header.stamp.sec * 1000000000ULL + tfArrayIn.eulers[i].header.stamp.nsec);
setTransform(Stamped<Transform>(Transform(Quaternion(tfArrayIn.eulers[i].yaw, tfArrayIn.eulers[i].pitch, tfArrayIn.eulers[i].roll),
Vector3(tfArrayIn.eulers[i].x, tfArrayIn.eulers[i].y, tfArrayIn.eulers[i].z)),
- tfArrayIn.eulers[i].header.stamp.sec * 1000000000ULL + tfArrayIn.eulers[i].header.stamp.nsec,
+ tfArrayIn.eulers[i].header.stamp.sec * (uint64_t)1000000000ULL + tfArrayIn.eulers[i].header.stamp.nsec,
tfArrayIn.eulers[i].header.frame_id , tfArrayIn.eulers[i].parent) );
}
catch (tf::TransformException &ex)
@@ -175,7 +175,7 @@
// setWithQuaternion(tfArrayIn.quaternions[i].header.frame_id, tfArrayIn.quaternions[i].parent, tfArrayIn.quaternions[i].xt, tfArrayIn.quaternions[i].yt, tfArrayIn.quaternions[i].zt, tfArrayIn.quaternions[i].xr, tfArrayIn.quaternions[i].yr, tfArrayIn.quaternions[i].zr, tfArrayIn.quaternions[i].w, tfArrayIn.quaternions[i].header.stamp.sec * 1000000000ULL + tfArrayIn.quaternions[i].header.stamp.nsec);
setTransform(Stamped<Transform>(Transform(Quaternion(tfArrayIn.quaternions[i].xr, tfArrayIn.quaternions[i].yr, tfArrayIn.quaternions[i].zr, tfArrayIn.quaternions[i].w),
Vector3(tfArrayIn.quaternions[i].xt, tfArrayIn.quaternions[i].yt, tfArrayIn.quaternions[i].zt)),
- tfArrayIn.quaternions[i].header.stamp.sec * 1000000000ULL + tfArrayIn.quaternions[i].header.stamp.nsec,
+ tfArrayIn.quaternions[i].header.stamp.sec * (uint64_t)1000000000ULL + tfArrayIn.quaternions[i].header.stamp.nsec,
tfArrayIn.quaternions[i].header.frame_id , tfArrayIn.quaternions[i].parent)
);
}
Modified: pkg/trunk/util/tf/src/tf.cpp
===================================================================
--- pkg/trunk/util/tf/src/tf.cpp 2008-11-08 04:33:47 UTC (rev 6448)
+++ pkg/trunk/util/tf/src/tf.cpp 2008-11-08 05:00:39 UTC (rev 6449)
@@ -386,7 +386,7 @@
{
unsigned int parent_id;
try{
- getFrame(counter)->getData(0ULL, temp);
+ getFrame(counter)->getData((uint64_t)0ULL, temp);
parent_id = temp.parent_frame_id;
}
catch (tf::LookupException& ex)
@@ -411,7 +411,7 @@
for (unsigned int counter = 1; counter < frames_.size(); counter ++)
{
try{
- getFrame(counter)->getData(0ULL, temp);
+ getFrame(counter)->getData((uint64_t)0ULL, temp);
}
catch (tf::LookupException& ex)
{
Modified: pkg/trunk/util/tf/test/testBroadcaster.cpp
===================================================================
--- pkg/trunk/util/tf/test/testBroadcaster.cpp 2008-11-08 04:33:47 UTC (rev 6448)
+++ pkg/trunk/util/tf/test/testBroadcaster.cpp 2008-11-08 05:00:39 UTC (rev 6449)
@@ -49,7 +49,7 @@
<< 0 << 0 << 1 << 3
<< 0 << 0 << 0 << 1;
- broadcaster.sendTransform(btTransform(btQuaternion(0,0,0), btVector3(1,2,3)), 1000000000ULL, "frame1", "frame2");
+ broadcaster.sendTransform(btTransform(btQuaternion(0,0,0), btVector3(1,2,3)), (uint64_t)1000000000ULL, "frame1", "frame2");
/* pTFServer->sendEuler("count","count++",1,1,1,1,1,1,ros::Time(100000,100000));
pTFServer->sendInverseEuler("count","count++",1,1,1,1,1,1,ros::Time(100000,100000));
pTFServer->sendDH("count","count++",1,1,1,1,ros::Time(100000,100000));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
