Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3929/src/database
Modified Files:
tcAirDBObject.cpp
Log Message:
Index: tcAirDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcAirDBObject.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcAirDBObject.cpp 20 Nov 2006 00:17:40 -0000 1.17
--- tcAirDBObject.cpp 27 Nov 2006 00:46:39 -0000 1.18
***************
*** 51,54 ****
--- 51,63 ----
}
+ /**
+ * Calculate private parameters. Should be called after
+ * object is loaded.
+ */
+ void tcAirDBObject::CalculateParams()
+ {
+ tcWaterDetectionDBObject::CalculateParams(mfMaxSpeed_kts);
+ }
+
float tcAirDBObject::GetFuelConsumptionConstant(float speed_kts) const
***************
*** 91,94 ****
--- 100,104 ----
tcAirDetectionDBObject::AddSqlColumns(columnString);
+ tcWaterDetectionDBObject::AddSqlColumns(columnString);
columnString += ",";
***************
*** 106,109 ****
--- 116,120 ----
tcAirDetectionDBObject::ReadSql(entry);
+ tcWaterDetectionDBObject::ReadSql(entry);
maxTakeoffWeight_kg = entry.GetDouble("MaxTakeoffWeight_kg");
***************
*** 112,115 ****
--- 123,128 ----
gmax = entry.GetDouble("Gmax");
isCarrierCompatible = entry.GetInt("IsCarrierCompatible") != 0;
+
+ CalculateParams();
}
***************
*** 119,122 ****
--- 132,136 ----
tcAirDetectionDBObject::WriteSql(valueString);
+ tcWaterDetectionDBObject::WriteSql(valueString);
std::stringstream s;
***************
*** 137,140 ****
--- 151,155 ----
tcPlatformDBObject(),
tcAirDetectionDBObject(),
+ tcWaterDetectionDBObject(),
maxTakeoffWeight_kg(0),
maxAltitude_m(0),
***************
*** 149,152 ****
--- 164,168 ----
: tcPlatformDBObject(obj),
tcAirDetectionDBObject(obj),
+ tcWaterDetectionDBObject(obj),
maxTakeoffWeight_kg(obj.maxTakeoffWeight_kg),
maxAltitude_m(obj.maxAltitude_m),
|
