[Gcblue-commits] gcb_wx/src/scriptinterface tcSimPythonInterface.cpp,1.18,1.19 tcTrackInterface.cpp,
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-11-06 15:14:03
|
Update of /cvsroot/gcblue/gcb_wx/src/scriptinterface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31472/src/scriptinterface Modified Files: tcSimPythonInterface.cpp tcTrackInterface.cpp Log Message: Added optical sensor model, fixed generic model display for sensor tracks Index: tcSimPythonInterface.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcSimPythonInterface.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tcSimPythonInterface.cpp 5 Sep 2004 01:02:02 -0000 1.18 --- tcSimPythonInterface.cpp 6 Nov 2004 15:13:42 -0000 1.19 *************** *** 608,611 **** --- 608,612 ---- .def("DeclareFriendly", &tcTrackInterface::DeclareFriendly) .def("DropTrack", &tcTrackInterface::DropTrack) + .def("UpdateAmbiguityList", &tcTrackInterface::UpdateAmbiguityList) ; TrackInterface = TrackInterfaceType(); Index: tcTrackInterface.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcTrackInterface.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcTrackInterface.cpp 1 Nov 2004 03:17:18 -0000 1.7 --- tcTrackInterface.cpp 6 Nov 2004 15:13:42 -0000 1.8 *************** *** 41,45 **** tcAllianceSensorMap* tcTrackInterface::mpSensorMap = NULL; ! unsigned int tcTrackInterface::mnTrackID = 0xFFFFFFFF; void tcTrackInterface::AttachSensorMap(tcAllianceSensorMap *apSM) --- 41,46 ---- tcAllianceSensorMap* tcTrackInterface::mpSensorMap = NULL; ! long tcTrackInterface::mnTrackID = -1; ! void tcTrackInterface::AttachSensorMap(tcAllianceSensorMap *apSM) *************** *** 52,57 **** void tcTrackInterface::DropTrack() { ! if (mpSensorMap == NULL) {return;} ! mpSensorMap->DropTrack(mnTrackID); } --- 53,73 ---- void tcTrackInterface::DropTrack() { ! if (mpSensorMap == NULL) {return;} ! mpSensorMap->DropTrack(mnTrackID); ! } ! ! tcSensorMapTrack* tcTrackInterface::GetTrack() ! { ! wxASSERT(mpSensorMap); ! if (mpSensorMap == 0) return 0; ! if (mnTrackID == -1) return 0; ! tcSensorMapTrack* track = mpSensorMap->GetSensorMapTrack(mnTrackID); ! if (track == NULL) ! { ! fprintf(stderr, "Warning - tcTrackInterface::GetTrack - " ! "couldn't find track id: %d, alliance: %d\n", ! mnTrackID, mpSensorMap->GetAlliance()); ! } ! return track; } *************** *** 85,88 **** --- 101,112 ---- } + void tcTrackInterface::UpdateAmbiguityList() + { + tcSensorMapTrack* track = GetTrack(); + if (track) + { + track->UpdateAmbiguityList(); + } + } tcTrackInterface::tcTrackInterface() |