[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp,1.29,1.30 tcGenericDBObject.cpp,1.22,1.23 tcRada
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp,1.29,1.30 tcGenericDBObject.cpp,1.22,1.23 tcRadarDBObject.cpp,1.16,1.17 tcSensorDBObject.cpp,1.13,1.14 tcSonarDBObject.cpp,1.3,1.4
|
From: Dewitt C. <ddc...@us...> - 2005-06-28 02:51:44
|
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6347/src/database Modified Files: tcDatabase.cpp tcGenericDBObject.cpp tcRadarDBObject.cpp tcSensorDBObject.cpp tcSonarDBObject.cpp Log Message: Index: tcSonarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSonarDBObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcSonarDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.3 --- tcSonarDBObject.cpp 28 Jun 2005 02:51:34 -0000 1.4 *************** *** 31,35 **** #include "database/tcSqlReader.h" #include <sstream> - //#include "tcSonar.h" #ifdef _DEBUG --- 31,34 ---- *************** *** 142,147 **** localNode->SetAttribute("SL", SL); localNode->SetAttribute("DI", DI); - localNode->SetAttribute("DT", DT); - localNode->SetAttribute("DTr", DTr); localNode->SetAttribute("minFrequency_Hz", minFrequency_Hz); localNode->SetAttribute("maxFrequency_Hz", maxFrequency_Hz); --- 141,144 ---- *************** *** 165,170 **** columnString += "SL number(4),"; columnString += "DI number(4),"; - columnString += "DT number(4),"; - columnString += "DTr number(4),"; columnString += "minFrequency_Hz number(5),"; columnString += "maxFrequency_Hz number(5),"; --- 162,165 ---- *************** *** 174,178 **** columnString += "maxScope_m number(4),"; columnString += "isWakeHoming number(1),"; - columnString += "applyScanLoss number(1),"; columnString += "bearingResolution_deg number(5),"; --- 169,172 ---- *************** *** 186,191 **** SL = entry.GetDouble("SL"); DI = entry.GetDouble("DI"); - DT = entry.GetDouble("DT"); - DTr = entry.GetDouble("DTr"); minFrequency_Hz = entry.GetDouble("minFrequency_Hz"); maxFrequency_Hz = entry.GetDouble("maxFrequency_Hz"); --- 180,183 ---- *************** *** 196,200 **** maxScope_m = entry.GetDouble("maxScope_m"); isWakeHoming = entry.GetInt("isWakeHoming") != 0; - applyScanLoss = entry.GetInt("applyScanLoss") != 0; bearingResolution_deg = entry.GetDouble("bearingResolution_deg"); --- 188,191 ---- *************** *** 212,217 **** s << SL << ","; s << DI << ","; - s << DT << ","; - s << DTr << ","; s << minFrequency_Hz << ","; s << maxFrequency_Hz << ","; --- 203,206 ---- *************** *** 222,226 **** s << maxScope_m << ","; s << (long)isWakeHoming << ","; - s << (long)applyScanLoss << ","; s << bearingResolution_deg << ","; --- 211,214 ---- *************** *** 234,239 **** SL(10), DI(3), - DT(3), - DTr(3), minFrequency_Hz(2000), maxFrequency_Hz(3000), --- 222,225 ---- *************** *** 243,247 **** maxScope_m(0), isWakeHoming(false), - applyScanLoss(false), bearingResolution_deg(5.0f) { --- 229,232 ---- *************** *** 259,264 **** SL(obj.SL), DI(obj.DI), - DT(obj.DT), - DTr(obj.DTr), minFrequency_Hz(obj.minFrequency_Hz), maxFrequency_Hz(obj.maxFrequency_Hz), --- 244,247 ---- *************** *** 268,272 **** maxScope_m(obj.maxScope_m), isWakeHoming(obj.isWakeHoming), - applyScanLoss(obj.applyScanLoss), bearingResolution_deg(obj.bearingResolution_deg) { --- 251,254 ---- Index: tcSensorDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSensorDBObject.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcSensorDBObject.cpp 22 Jun 2005 01:22:08 -0000 1.13 --- tcSensorDBObject.cpp 28 Jun 2005 02:51:34 -0000 1.14 *************** *** 50,61 **** return 0; } ! /** ! * workaround for write serialization issue ! * @return true if db obj is a leaf obj ! */ ! bool tcSensorDBObject::IsLeaf() const ! { ! return mnClassID == DTYPE_SENSOR; ! } --- 50,62 ---- return 0; } ! ! /** ! * workaround for write serialization issue ! * @return true if db obj is a leaf obj ! */ ! bool tcSensorDBObject::IsLeaf() const ! { ! return mnClassID == DTYPE_SENSOR; ! } Index: tcRadarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcRadarDBObject.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tcRadarDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.16 --- tcRadarDBObject.cpp 28 Jun 2005 02:51:34 -0000 1.17 *************** *** 80,89 **** { file.Read(&mfMaxRange_km,sizeof(mfMaxRange_km)); - file.Read(&mfMinRange_km,sizeof(mfMinRange_km)); file.Read(&mfRefRange_km,sizeof(mfRefRange_km)); file.Read(&mfERP_dBW,sizeof(mfERP_dBW)); file.Read(&mfFieldOfView_deg,sizeof(mfFieldOfView_deg)); file.Read(&mfScanPeriod_s,sizeof(mfScanPeriod_s)); - file.Read(&mfMinRangeRate_mps,sizeof(mfMinRangeRate_mps)); file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface)); file.Read(&mbDetectsAir,sizeof(mbDetectsAir)); --- 80,87 ---- *************** *** 94,103 **** { file.Write(&mfMaxRange_km,sizeof(mfMaxRange_km)); - file.Write(&mfMinRange_km,sizeof(mfMinRange_km)); file.Write(&mfRefRange_km,sizeof(mfRefRange_km)); file.Write(&mfERP_dBW,sizeof(mfERP_dBW)); file.Write(&mfFieldOfView_deg,sizeof(mfFieldOfView_deg)); file.Write(&mfScanPeriod_s,sizeof(mfScanPeriod_s)); - file.Write(&mfMinRangeRate_mps,sizeof(mfMinRangeRate_mps)); file.Write(&mbDetectsSurface,sizeof(mbDetectsSurface)); file.Write(&mbDetectsAir,sizeof(mbDetectsAir)); --- 92,99 ---- *************** *** 112,118 **** if (mbLoad) { - file.Read(&mfMinRange_km,sizeof(mfMinRange_km)); file.Read(&mfERP_dBW,sizeof(mfERP_dBW)); - file.Read(&mfMinRangeRate_mps,sizeof(mfMinRangeRate_mps)); file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface)); file.Read(&mbDetectsAir,sizeof(mbDetectsAir)); --- 108,112 ---- *************** *** 121,127 **** else { - file.Write(&mfMinRange_km,sizeof(mfMinRange_km)); file.Write(&mfERP_dBW,sizeof(mfERP_dBW)); - file.Write(&mfMinRangeRate_mps,sizeof(mfMinRangeRate_mps)); file.Write(&mbDetectsSurface,sizeof(mbDetectsSurface)); file.Write(&mbDetectsAir,sizeof(mbDetectsAir)); --- 115,119 ---- *************** *** 139,145 **** int val; - *csv >> mfMinRange_km; *csv >> mfERP_dBW; - *csv >> mfMinRangeRate_mps; *csv >> maxFireControlTracks; *csv >> val; isSemiactive = val != 0; --- 131,135 ---- *************** *** 151,157 **** else { - *csv << mfMinRange_km; *csv << mfERP_dBW; - *csv << mfMinRangeRate_mps; *csv << (long)maxFireControlTracks; *csv << (long)isSemiactive; --- 141,145 ---- *************** *** 176,182 **** TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("radar"))->ToElement(); - localNode->SetAttribute("minRange_km", mfMinRange_km); localNode->SetAttribute("erp", mfERP_dBW); - localNode->SetAttribute("minRangeRate_mps", mfMinRangeRate_mps); localNode->SetAttribute("maxFireControlTracks", (int)maxFireControlTracks); localNode->SetAttribute("isSemiactive", (int)isSemiactive); --- 164,168 ---- *************** *** 193,199 **** tcSensorDBObject::WriteCSVHeader(csv); - *csv << "MinRange_km"; *csv << "ERP_dBW"; - *csv << "MinRangeRate_mps"; *csv << "MaxFireControlTracks"; *csv << "IsSemiactive"; --- 179,183 ---- *************** *** 217,223 **** columnString += ","; - columnString += "MinRange_km number(5),"; columnString += "ERP_dBW number(3),"; - columnString += "MinRangeRate_mps number(5),"; columnString += "MaxFireControlTracks number(3),"; columnString += "IsSemiactive number(1),"; --- 201,205 ---- *************** *** 232,238 **** tcSensorDBObject::ReadSql(entry); - mfMinRange_km = entry.GetDouble("MinRange_km"); mfERP_dBW = entry.GetDouble("ERP_dBW"); - mfMinRangeRate_mps = entry.GetDouble("MinRangeRate_mps"); maxFireControlTracks = entry.GetInt("MaxFireControlTracks"); isSemiactive = entry.GetInt("IsSemiactive") != 0; --- 214,218 ---- *************** *** 252,258 **** s << ","; - s << mfMinRange_km << ","; s << mfERP_dBW << ","; - s << mfMinRangeRate_mps << ","; s << (long)maxFireControlTracks << ","; s << (long)isSemiactive << ","; --- 232,236 ---- *************** *** 271,280 **** mnClassID = DTYPE_RADAR; mfMaxRange_km = 100.0f; - mfMinRange_km = 0.1f; mfRefRange_km = 50.0f; mfERP_dBW = 100.0f; mfFieldOfView_deg = 90.0f; mfScanPeriod_s = 4.0f; - mfMinRangeRate_mps = 0.0f; mbDetectsSurface = true; mbDetectsAir = true; --- 249,256 ---- *************** *** 287,294 **** : tcSensorDBObject(obj) { ! mnClassID = DTYPE_RADAR; ! mfMinRange_km = obj.mfMinRange_km; mfERP_dBW = obj.mfERP_dBW; - mfMinRangeRate_mps = obj.mfMinRangeRate_mps; mbDetectsSurface = obj.mbDetectsSurface; mbDetectsAir = obj.mbDetectsAir; --- 263,268 ---- : tcSensorDBObject(obj) { ! mnClassID = DTYPE_RADAR; mfERP_dBW = obj.mfERP_dBW; mbDetectsSurface = obj.mbDetectsSurface; mbDetectsAir = obj.mbDetectsAir; Index: tcGenericDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tcGenericDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.22 --- tcGenericDBObject.cpp 28 Jun 2005 02:51:34 -0000 1.23 *************** *** 46,51 **** { ! ! tcFlightportDBObject* tcGenericDBObject::GetFlightport() --- 46,56 ---- { ! /** ! * Update calculated parameters based on database values ! */ ! void tcGenericDBObject::CalculateParams() ! { ! fuelConsumptionConstant = mfMaxSpeed_kts > 0 ? (mfFuelRate_kgps / mfMaxSpeed_kts) : 0; ! } tcFlightportDBObject* tcGenericDBObject::GetFlightport() *************** *** 62,65 **** --- 67,75 ---- } + float tcGenericDBObject::GetFuelConsumptionConstant() const + { + return fuelConsumptionConstant; + } + /** * @return relative az of launcher n or 0 for default or if error *************** *** 605,608 **** --- 615,620 ---- } + CalculateParams(); + tcSensorPlatformDBObject::ReadSql(entry); *************** *** 676,680 **** tcGenericDBObject::tcGenericDBObject() : tcDatabaseObject(), ! tcSensorPlatformDBObject() { mnClassID = DTYPE_GENERIC; --- 688,693 ---- tcGenericDBObject::tcGenericDBObject() : tcDatabaseObject(), ! tcSensorPlatformDBObject(), ! fuelConsumptionConstant(0) { mnClassID = DTYPE_GENERIC; Index: tcDatabase.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tcDatabase.cpp 22 Jun 2005 01:22:07 -0000 1.29 --- tcDatabase.cpp 28 Jun 2005 02:51:34 -0000 1.30 *************** *** 889,893 **** if (mapIter == nameToKey.end()) { ! fprintf(stderr, "Error - tcDatabase::GetObject - not found in nameToKey\n"); return 0; } --- 889,894 ---- if (mapIter == nameToKey.end()) { ! fprintf(stderr, "Error - tcDatabase::GetObject - not found in nameToKey (%s)\n", ! className.c_str()); return 0; } |
