|
From: <tf...@us...> - 2008-04-17 22:18:57
|
Revision: 120
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=120&view=rev
Author: tfoote
Date: 2008-04-17 15:19:01 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
removing extraneous constructors
Modified Paths:
--------------
pkg/trunk/libTF/simple/Quaternion3D.cc
pkg/trunk/libTF/simple/Quaternion3D.hh
pkg/trunk/libTF/simple/libTF.cc
pkg/trunk/libTF/simple/testQuat.cc
Modified: pkg/trunk/libTF/simple/Quaternion3D.cc
===================================================================
--- pkg/trunk/libTF/simple/Quaternion3D.cc 2008-04-17 21:47:02 UTC (rev 119)
+++ pkg/trunk/libTF/simple/Quaternion3D.cc 2008-04-17 22:19:01 UTC (rev 120)
@@ -39,7 +39,7 @@
};
-Quaternion3D::Quaternion3D(double _xt, double _yt, double _zt, double _xr, double _yr, double _zr, double _w, unsigned long long time):
+Quaternion3D::Quaternion3D():
max_storage_time(MAX_STORAGE_TIME),
first(NULL),
last(NULL)
@@ -50,15 +50,6 @@
return;
};
-Quaternion3D::Quaternion3D(NEWMAT::Matrix matrixIn, unsigned long long time):
- max_storage_time(MAX_STORAGE_TIME),
- first(NULL),
- last(NULL)
-{
- pthread_mutex_init( &linked_list_mutex, NULL);
- fromMatrix(matrixIn, time);
-};
-
void Quaternion3D::Set(double _xt, double _yt, double _zt, double _xr, double _yr, double _zr, double _w, unsigned long long time)
{
Quaternion3DStorage temp;
Modified: pkg/trunk/libTF/simple/Quaternion3D.hh
===================================================================
--- pkg/trunk/libTF/simple/Quaternion3D.hh 2008-04-17 21:47:02 UTC (rev 119)
+++ pkg/trunk/libTF/simple/Quaternion3D.hh 2008-04-17 22:19:01 UTC (rev 120)
@@ -66,10 +66,8 @@
};
/** Constructors **/
- // Standard constructor which takes in 7 doubles
- Quaternion3D(double _xt, double _yt, double _zt, double _xr, double _yr, double _zr, double _w, unsigned long long time);
- // Constructor from Matrix
- Quaternion3D(NEWMAT::Matrix matrixIn, unsigned long long time);
+ // Standard constructor
+ Quaternion3D();
/** Mutators **/
// Set the values manually
Modified: pkg/trunk/libTF/simple/libTF.cc
===================================================================
--- pkg/trunk/libTF/simple/libTF.cc 2008-04-17 21:47:02 UTC (rev 119)
+++ pkg/trunk/libTF/simple/libTF.cc 2008-04-17 22:19:01 UTC (rev 120)
@@ -34,7 +34,7 @@
RefFrame::RefFrame() :
parent(0),
- myQuat(0,0,0,0,0,0,1,111110000)
+ myQuat()
{
return;
}
Modified: pkg/trunk/libTF/simple/testQuat.cc
===================================================================
--- pkg/trunk/libTF/simple/testQuat.cc 2008-04-17 21:47:02 UTC (rev 119)
+++ pkg/trunk/libTF/simple/testQuat.cc 2008-04-17 22:19:01 UTC (rev 120)
@@ -37,9 +37,11 @@
int main()
{
- Quaternion3D myquat(1,1,1,1,1,1,1,1000101010);
+ Quaternion3D myquat;
- Quaternion3D my2ndquat(myquat.asMatrix(1000101010),1000101010);
+ Quaternion3D my2ndquat;
+ myquat.Set(1,1,1,0,0,0,1,1000101010);
+ my2ndquat.Set(1,1,1,0,0,0,1,1000101010);
std::cout << "Quat1"<<std::endl;
myquat.printMatrix(1000101010);
std::cout << "Quat2"<<std::endl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|