Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15614/src/database
Modified Files:
tcGenericDBObject.cpp tcSensorDBObject.cpp
Log Message:
Better sensor ageout behavior, more ai work, misc cleanup
Index: tcSensorDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSensorDBObject.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcSensorDBObject.cpp 29 Nov 2004 03:55:05 -0000 1.10
--- tcSensorDBObject.cpp 2 Mar 2005 22:28:42 -0000 1.11
***************
*** 97,100 ****
--- 97,103 ----
*csv >> mfFieldOfView_deg;
*csv >> mfScanPeriod_s;
+ long temp;
+ *csv >> temp;
+ isSurveillance = (temp != 0);
}
else
***************
*** 104,107 ****
--- 107,111 ----
*csv << mfFieldOfView_deg;
*csv << mfScanPeriod_s;
+ *csv << (long)isSurveillance;
// csv->WriteLine(); // do not writeline since this isn't a leaf class
}
***************
*** 124,127 ****
--- 128,132 ----
localNode->SetAttribute("fieldOfView_deg", mfFieldOfView_deg);
localNode->SetAttribute("scanPeriod_s", mfScanPeriod_s);
+ localNode->SetAttribute("IsSurveillance", isSurveillance);
tcDatabaseObject::SerializeXml(node, load);
***************
*** 136,139 ****
--- 141,145 ----
*csv << "FieldOfView_deg";
*csv << "ScanPeriod_s";
+ *csv << "IsSurveillance";
return 1;
}
***************
*** 152,156 ****
columnString += "RefRange_km number(6),";
columnString += "FieldOfView_deg number(3),";
! columnString += "ScanPeriod_s number(5)";
}
--- 158,163 ----
columnString += "RefRange_km number(6),";
columnString += "FieldOfView_deg number(3),";
! columnString += "ScanPeriod_s number(5),";
! columnString += "IsSurveillance number(1)";
}
***************
*** 163,166 ****
--- 170,174 ----
mfFieldOfView_deg = entry.GetDouble("FieldOfView_deg");
mfScanPeriod_s = entry.GetDouble("ScanPeriod_s");
+ isSurveillance = entry.GetInt("IsSurveillance") != 0;
}
***************
*** 176,180 ****
s << mfRefRange_km << ",";
s << mfFieldOfView_deg << ",";
! s << mfScanPeriod_s;
valueString += s.str();
--- 184,189 ----
s << mfRefRange_km << ",";
s << mfFieldOfView_deg << ",";
! s << mfScanPeriod_s << ",";
! s << isSurveillance;
valueString += s.str();
***************
*** 191,194 ****
--- 200,204 ----
mfFieldOfView_deg = 360.0f;
mfScanPeriod_s = 4.0f;
+ isSurveillance = true;
}
***************
*** 202,205 ****
--- 212,216 ----
mfFieldOfView_deg = obj.mfFieldOfView_deg;
mfScanPeriod_s = obj.mfScanPeriod_s;
+ isSurveillance = obj.isSurveillance;
}
Index: tcGenericDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcGenericDBObject.cpp 31 Jan 2005 01:33:07 -0000 1.19
--- tcGenericDBObject.cpp 2 Mar 2005 22:28:42 -0000 1.20
***************
*** 619,643 ****
columnString += s.GetBuffer();
! s.Format("S%d_az number(8),",i+1);
! columnString += s.GetBuffer();
! }
!
! for(i=0;i<MAXANIMATIONS;i++)
! {
! tcString s;
! s.Format("Anim%d_obj varchar(30),",i+1);
columnString += s.GetBuffer();
! s.Format("Anim%d_type varchar(30),",i+1);
! columnString += s.GetBuffer();
- s.Format("Anim%d_param number(3)",i+1);
- columnString += s.GetBuffer();
- if (i < MAXANIMATIONS - 1) columnString += ",";
- }
-
-
-
}
--- 619,629 ----
columnString += s.GetBuffer();
! s.Format("S%d_az number(8)",i+1);
columnString += s.GetBuffer();
! if (i < MAXSENSORS - 1) columnString += ",";
! }
}
|
