Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22513/src/database
Modified Files:
tcSonobuoyDBObject.cpp
Log Message:
Index: tcSonobuoyDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSonobuoyDBObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSonobuoyDBObject.cpp 20 Nov 2006 00:17:40 -0000 1.4
--- tcSonobuoyDBObject.cpp 6 Dec 2006 01:20:42 -0000 1.5
***************
*** 56,59 ****
--- 56,60 ----
tcDatabaseObject::AddSqlColumns(columnString);
tcSensorPlatformDBObject::AddSqlColumns(columnString);
+ tcWaterDetectionDBObject::AddSqlColumns(columnString);
columnString += ",";
***************
*** 67,73 ****
--- 68,77 ----
tcDatabaseObject::ReadSql(entry);
tcSensorPlatformDBObject::ReadSql(entry);
+ tcWaterDetectionDBObject::ReadSql(entry);
batteryLife_s = entry.GetDouble("BatteryLife_s");
commRange_km = entry.GetDouble("CommRange_km");
+
+ tcWaterDetectionDBObject::CalculateParams(1.0);
}
***************
*** 76,79 ****
--- 80,84 ----
tcDatabaseObject::WriteSql(valueString);
tcSensorPlatformDBObject::WriteSql(valueString);
+ tcWaterDetectionDBObject::WriteSql(valueString);
std::stringstream s;
***************
*** 89,93 ****
tcSonobuoyDBObject::tcSonobuoyDBObject() : tcDatabaseObject(),
! tcSensorPlatformDBObject()
{
mzClass = "Default Sonobuoy";
--- 94,99 ----
tcSonobuoyDBObject::tcSonobuoyDBObject() : tcDatabaseObject(),
! tcSensorPlatformDBObject(),
! tcWaterDetectionDBObject()
{
mzClass = "Default Sonobuoy";
***************
*** 96,99 ****
--- 102,106 ----
tcSonobuoyDBObject::tcSonobuoyDBObject(tcSonobuoyDBObject& obj)
: tcDatabaseObject(obj), tcSensorPlatformDBObject(obj),
+ tcWaterDetectionDBObject(obj),
batteryLife_s(obj.batteryLife_s),
commRange_km(obj.commRange_km)
|
