X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FATC%2Fatc_mgr.cxx;h=22e5db5e80d31b37b5f9b6a729dd2ab6f9633ab9;hb=ed30b0c9a3818d5b8a306827184ac3525a1d8bdf;hp=0bdc5e5cd5a65ac31a3ba14dfb2dcf321a4c55f0;hpb=f8a8805e2dde01e0c0a962c283880fa60fa23f0f;p=flightgear.git

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index 0bdc5e5cd..22e5db5e8 100644
--- 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;
 
@@ -76,7 +77,8 @@ void FGATCManager::init() {
     ai_ac.setAltitude ( altitude  );
     ai_ac.setPerformance("jet_transport");
 
-    // NEXT UP: Create a traffic Schedule and fill that with appropriate information. This we can use to flight plannign.
+    // NEXT UP: Create a traffic Schedule and fill that with appropriate information. This we can use to flight planning.
+    // Note that these are currently only defaults. 
     FGAISchedule *trafficRef = new FGAISchedule;
     trafficRef->setFlightType("gate");
 
@@ -88,7 +90,7 @@ void FGATCManager::init() {
     flight->setCallSign(callsign);
     
     trafficRef->assign(flight);
-    FGAIFlightPlan *fp = new FGAIFlightPlan;
+    FGAIFlightPlan *fp = 0; 
     ai_ac.setTrafficRef(trafficRef);
     
     string flightPlanName = airport + "-" + airport + ".xml";
@@ -98,30 +100,33 @@ void FGATCManager::init() {
 
 
     FGAirport *apt = FGAirport::findByIdent(airport); 
-    FGAirportDynamics* dcs = apt->getDynamics();
-    int park_index = dcs->getNrOfParkings() - 1;
-    cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
-    if (onGround) {
+    if (apt && onGround) {
+        FGAirportDynamics* dcs = apt->getDynamics();
+        int park_index = dcs->getNrOfParkings() - 1;
+        //cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
+        fp = new FGAIFlightPlan;
         while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--;
             if (park_index < 0) {
                   SG_LOG( SG_GENERAL, SG_ALERT,
-                          "Failed to find parking position " << parking <<
-                           " at airport " << airport );
-             }
+                        "Failed to find parking position " << parking <<
+                        " at airport " << airport << " at " << SG_ORIGIN);
+            }
         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;
+            //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
             fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
-            leg = 4;
+            leg = 3;
             string fltType = "ga";
+            fp->setRunway(runway);
             fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
+            ai_ac.setTakeOffStatus(2);
         } else {
             controller = apt->getDynamics()->getStartupController();
-            int stationFreq = apt->getDynamics()->getGroundFrequency(2);
-            cerr << "Setting radio frequency to : " << stationFreq << endl;
+            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);
@@ -130,7 +135,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,
@@ -138,21 +143,26 @@ void FGATCManager::init() {
                                aircraftRadius,
                                fltType,
                                aircraftType,
-                               airline);
-         } 
+                               airline))) {
+                controller = 0;
+                return;
+            }
+
+        }
+        fp->getLastWaypoint()->setName( fp->getLastWaypoint()->getName() + string("legend")); 
      } else {
         controller = 0;
      }
 
     // Create an initial flightplan and assign it to the ai_ac. We won't use this flightplan, but it is necessary to
     // keep the ATC code happy. 
-    
-    
-    fp->restart();
-    fp->setLeg(leg);
-    ai_ac.SetFlightPlan(fp);
+    if (fp) {
+        fp->restart();
+        fp->setLeg(leg);
+        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);
 
@@ -162,6 +172,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) {
@@ -177,18 +188,23 @@ void FGATCManager::update ( double time ) {
     FGAIFlightPlan *fp = ai_ac.GetFlightPlan();
         
     /* test code : find out how the routing develops */
-    int size = fp->getNrOfWayPoints();
-    //cerr << "Setting pos" << pos << " ";
-    cerr << "setting intentions " ;
-    for (int i = 0; i < size; i++) {
-        int val = fp->getRouteIndex(i);
-        cerr << val << " ";
-        //if ((val) && (val != pos)) {
-            //intentions.push_back(val);
-            //cerr << "[done ] " << endl;
-        //}
+    if (fp) {
+        int size = fp->getNrOfWayPoints();
+    //    //cerr << "Setting pos" << pos << " ";
+    //    //cerr << "setting intentions " ;
+        for (int i = 0; i < size; i++) {
+    //        int val = fp->getRouteIndex(i);
+            //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;
     }
-    cerr << "[done ] " << endl;
     double longitude = fgGetDouble("/position/longitude-deg");
     double latitude  = fgGetDouble("/position/latitude-deg");
     double heading   = fgGetDouble("/orientation/heading-deg");
@@ -201,11 +217,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,
@@ -215,10 +232,22 @@ void FGATCManager::update ( double time ) {
         //string airport = fgGetString("/sim/presets/airport-id");
         //FGAirport *apt = FGAirport::findByIdent(airport); 
         // AT this stage we should update the flightplan, so that waypoint incrementing is conducted as well as leg loading. 
-
-       controller->render();
+       static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
+            int n = trans_num->getIntValue();
+        if (n == 1) {
+            //cerr << "Toggling ground network visibility " << networkVisible << endl;
+            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);
 }