Merge branch 'merge-requests/1555' into next

[flightgear.git] / src / ATC / atc_mgr.cxx

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index a70f968cf4072a039ca1dc14c72467894badf2c7..0fbec13134a55f4b9508b62988dc6e706b74e4eb 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -34,7 +34,10 @@
 
 
 FGATCManager::FGATCManager() {
+    controller = 0;
+    prevController = 0;
     networkVisible = false;
+    initSucceeded  = false;
 }
 
 FGATCManager::~FGATCManager() {
@@ -43,8 +46,6 @@ FGATCManager::~FGATCManager() {
 
 void FGATCManager::init() {
     SGSubsystem::init();
-    currentATCDialog = new FGATCDialogNew;
-    currentATCDialog->init();
 
     int leg = 0;
 
@@ -99,7 +100,7 @@ void FGATCManager::init() {
 
 
     FGAirport *apt = FGAirport::findByIdent(airport); 
-    if (apt && onGround) {
+    if (apt && onGround) {// && !runway.empty()) {
         FGAirportDynamics* dcs = apt->getDynamics();
         int park_index = dcs->getNrOfParkings() - 1;
         //cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
@@ -108,23 +109,29 @@ void FGATCManager::init() {
             if (park_index < 0) {
                   SG_LOG( SG_GENERAL, SG_ALERT,
                         "Failed to find parking position " << parking <<
-                        " at airport " << airport );
+                        " at airport " << airport << " at " << SG_ORIGIN);
             }
+        // No valid parking location, so either at the runway or at a random location.
         if (parking.empty() || (park_index < 0)) {
-            controller = apt->getDynamics()->getTowerController();
-            int stationFreq = apt->getDynamics()->getTowerFrequency(2);
-            //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
-            fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
-            leg = 4;
-            string fltType = "ga";
-            fp->setRunway(runway);
-            fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
+            if (!runway.empty()) {
+                controller = apt->getDynamics()->getTowerController();
+                int stationFreq = apt->getDynamics()->getTowerFrequency(2);
+                //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
+                fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+                leg = 3;
+                string fltType = "ga";
+                fp->setRunway(runway);
+                fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
+                ai_ac.setTakeOffStatus(2);
+            } else {
+                // We're on the ground somewhere. Handle this case later.
+            }
         } else {
             controller = apt->getDynamics()->getStartupController();
-            int stationFreq = apt->getDynamics()->getGroundFrequency(2);
+            int stationFreq = apt->getDynamics()->getGroundFrequency(1);
             //cerr << "Setting radio frequency to : " << stationFreq << endl;
             fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
-            leg = 2;
+            leg = 1;
             //double, lat, lon, head; // Unused variables;
             //int getId = apt->getDynamics()->getParking(gateId, &lat, &lon, &head);
             FGParking* parking = dcs->getParking(park_index);
@@ -133,7 +140,7 @@ void FGATCManager::init() {
             string aircraftType; // Unused.
             string airline;      // Currently used for gate selection, but a fallback mechanism will apply when not specified.
             fp->setGate(park_index);
-            fp->createPushBack(&ai_ac,
+            if (!(fp->createPushBack(&ai_ac,
                                false, 
                                apt, 
                                latitude,
@@ -141,8 +148,13 @@ void FGATCManager::init() {
                                aircraftRadius,
                                fltType,
                                aircraftType,
-                               airline);
-        } 
+                               airline))) {
+                controller = 0;
+                return;
+            }
+
+        }
+        fp->getLastWaypoint()->setName( fp->getLastWaypoint()->getName() + string("legend")); 
      } else {
         controller = 0;
      }
@@ -155,7 +167,7 @@ void FGATCManager::init() {
         ai_ac.SetFlightPlan(fp);
     }
     if (controller) {
-        controller->announcePosition(ai_ac.getID(), fp, fp->getCurrentWaypoint()->routeIndex,
+        controller->announcePosition(ai_ac.getID(), fp, fp->getCurrentWaypoint()->getRouteIndex(),
                                       ai_ac._getLatitude(), ai_ac._getLongitude(), heading, speed, altitude,
                                       aircraftRadius, leg, &ai_ac);
 
@@ -165,6 +177,7 @@ void FGATCManager::init() {
    //cerr << "Adding groundnetWork to the scenegraph::init" << endl;
    //globals->get_scenery()->get_scene_graph()->addChild(node);
    }
+   initSucceeded = true;
 }
 
 void FGATCManager::addController(FGATCController *controller) {
@@ -180,20 +193,23 @@ void FGATCManager::update ( double time ) {
     FGAIFlightPlan *fp = ai_ac.GetFlightPlan();
         
     /* test code : find out how the routing develops */
-    //if (fp) {
-    //    int size = fp->getNrOfWayPoints();
+    if (fp) {
+        int size = fp->getNrOfWayPoints();
     //    //cerr << "Setting pos" << pos << " ";
     //    //cerr << "setting intentions " ;
-    //    for (int i = 0; i < size; i++) {
+        for (int i = 0; i < size; i++) {
     //        int val = fp->getRouteIndex(i);
-    //        cerr << val << " ";
+            //cerr << fp->getWayPoint(i)->getName() << " ";
             //if ((val) && (val != pos)) {
                 //intentions.push_back(val);
                 //cerr << "[done ] " << endl;
             //}
-    //    }
-    //}
+        }
+    }
     //cerr << "[done ] " << endl;
+    if (fp) {
+        //cerr << "Currently at leg : " << fp->getLeg() << endl;
+    }
     double longitude = fgGetDouble("/position/longitude-deg");
     double latitude  = fgGetDouble("/position/latitude-deg");
     double heading   = fgGetDouble("/orientation/heading-deg");
@@ -206,11 +222,12 @@ void FGATCManager::update ( double time ) {
     ai_ac.setSpeed(speed);
     ai_ac.update(time);
     controller = ai_ac.getATCController();
-    currentATCDialog->update(time);
+    FGATCDialogNew::instance()->update(time);
     if (controller) {
-       
+       //cerr << "name of previous waypoint : " << fp->getPreviousWaypoint()->getName() << endl;
 
         //cerr << "Running FGATCManager::update()" << endl;
+        //cerr << "Currently under control of " << controller->getName() << endl;
         controller->updateAircraftInformation(ai_ac.getID(),
                                               latitude,
                                               longitude,
@@ -227,9 +244,15 @@ void FGATCManager::update ( double time ) {
             networkVisible = !networkVisible;
             trans_num->setIntValue(-1);
         }
+        if ((controller != prevController) && (prevController)) {
+            prevController->render(false);
+        }
         controller->render(networkVisible);
 
         //cerr << "Adding groundnetWork to the scenegraph::update" << endl;
+        prevController = controller;
+   }
+   for (AtcVecIterator atc = activeStations.begin(); atc != activeStations.end(); atc++) {
+       (*atc)->update(time);
    }
-   //globals->get_scenery()->get_scene_graph()->addChild(node);
 }