X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fapt_dlg.cxx;h=d7c0b6334088acca8b96c5ab04f6fb4831ad5468;hb=f0e6716953604730579a5e45f785fd063737dce4;hp=7f8f81fb66e34e0eb1acddeadc799ef018840a67;hpb=182fd42b4017fa54d680508c092ea1b216398a00;p=flightgear.git

diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx
index 7f8f81fb6..d7c0b6334 100644
--- a/src/GUI/apt_dlg.cxx
+++ b/src/GUI/apt_dlg.cxx
@@ -12,19 +12,19 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Include/general.hxx>
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <Airports/simple.hxx>
 #include <FDM/flight.hxx>
 #include <Main/fg_init.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-//#include <Time/fg_time.hxx>
+#include <Scenery/tilemgr.hxx>
 
 #include "gui.h"
 #include "gui_local.hxx"
@@ -46,103 +46,125 @@ static puOneShot       *AptDialogResetButton = 0;
 
 void AptDialog_Cancel(puObject *)
 {
-	FG_POP_PUI_DIALOG( AptDialog );
+    FG_POP_PUI_DIALOG( AptDialog );
 }
 
 void AptDialog_OK (puObject *)
 {
-	FGPath path( globals->get_fg_root() );
-	path.append( "Airports" );
-	path.append( "simple.mk4" );
-	FGAirports airports( path.c_str() );
-
-	FGAirport a;
-
-	int freeze = globals->get_freeze();
-	if(!freeze)
-		globals->set_freeze( true );
-
-	char *s;
-	AptDialogInput->getValue(&s);
-	string AptId(s);
-
-	cout << "AptDialog_OK " << AptId << " " << AptId.length() << endl;
-
-	AptDialog_Cancel( NULL );
-
-	if ( AptId.length() ) {
-		// set initial position from airport id
-		SG_LOG( SG_GENERAL, SG_INFO,
-				"Attempting to set starting position from airport code "
-				<< AptId );
-
-		if ( airports.search( AptId, &a ) )
-		{
-			fgSetString("/sim/startup/airport-id",  AptId.c_str() );
-			// fgSetDouble("/position/altitude", -9999.0 );
-			// fgSetPosFromAirportID( AptId );
-			fgSetPosFromAirportIDandHdg( AptId, 
-						     cur_fdm_state->get_Psi() *
-						     SGD_RADIANS_TO_DEGREES);
-			BusyCursor(0);
-			fgReInitSubsystems();
-			BusyCursor(1);
-		} else {
-			AptId  += " not in database.";
-			mkDialog(AptId.c_str());
-		}
-	}
-	if(!freeze)
-		globals->set_freeze( false );
+    static const SGPropertyNode *longitude
+	= fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+	= fgGetNode("/position/latitude-deg");
+
+    SGPath path( globals->get_fg_root() );
+    path.append( "Airports" );
+    path.append( "simple.mk4" );
+    FGAirports airports( path.c_str() );
+
+    FGAirport a;
+
+    int freeze = globals->get_freeze();
+    if(!freeze)
+        globals->set_freeze( true );
+
+    char *s;
+    AptDialogInput->getValue(&s);
+    string AptId(s);
+
+    cout << "AptDialog_OK " << AptId << " " << AptId.length() << endl;
+
+    AptDialog_Cancel( NULL );
+
+    if ( AptId.length() ) {
+        // set initial position from airport id
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Attempting to set starting position from airport code "
+                << AptId );
+
+        if ( airports.search( AptId, &a ) )
+        {
+            // unbind the current fdm state so property changes
+            // don't get lost when we subsequently delete this fdm
+            // and create a new one.
+            cur_fdm_state->unbind();
+        
+            AptId = a.id.c_str();  /// NHV fix wrong case crash
+            fgSetString("/sim/startup/airport-id",  AptId.c_str() );
+            // fgSetDouble("/position/altitude-ft", -9999.0 );
+            // fgSetPosFromAirportID( AptId );
+            fgSetPosFromAirportIDandHdg( AptId, 
+                                         cur_fdm_state->get_Psi() *
+                                         SGD_RADIANS_TO_DEGREES);
+            // BusyCursor(0);
+            fgReInitSubsystems();
+            // if ( global_tile_mgr.init() ) {
+            // Load the local scenery data
+            global_tile_mgr.update( longitude->getDoubleValue(),
+                                    latitude->getDoubleValue() );
+            // } else {
+            // SG_LOG( SG_GENERAL, SG_ALERT, 
+            // "Error in Tile Manager initialization!" );
+            // exit(-1);
+            // }
+            // BusyCursor(1);
+        } else {
+            AptId  += " not in database.";
+            mkDialog(AptId.c_str());
+        }
+    }
+    if ( !freeze ) {
+        globals->set_freeze( false );
+    }
 }
 
+
 void AptDialog_Reset(puObject *)
 {
-	//  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
-	sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-	AptDialogInput->setValue ( NewAirportId );
-	AptDialogInput->setCursor( 0 ) ;
+    //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    AptDialogInput->setValue ( NewAirportId );
+    AptDialogInput->setCursor( 0 ) ;
 }
 
 void NewAirport(puObject *cb)
 {
-	//  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
-	sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-//	cout << "NewAirport " << NewAirportId << endl;
-	AptDialogInput->setValue( NewAirportId );
+    //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    // cout << "NewAirport " << NewAirportId << endl;
+    AptDialogInput->setValue( NewAirportId );
 
-	FG_PUSH_PUI_DIALOG( AptDialog );
+    FG_PUSH_PUI_DIALOG( AptDialog );
 }
 
 void NewAirportInit(void)
 {
-	sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-	int len = 150 - puGetStringWidth( puGetDefaultLabelFont(),
-									  NewAirportLabel ) / 2;
-
-	AptDialog = new puDialogBox (150, 50);
-	{
-		AptDialogFrame   = new puFrame           (0,0,350, 150);
-		AptDialogMessage = new puText            (len, 110);
-		AptDialogMessage ->    setLabel          (NewAirportLabel);
-
-		AptDialogInput   = new puInput           (50, 70, 300, 100);
-		AptDialogInput   ->    setValue          (NewAirportId);
-		AptDialogInput   ->    acceptInput();
-
-		AptDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
-		AptDialogOkButton     ->     setLegend   (gui_msg_OK);
-		AptDialogOkButton     ->     setCallback (AptDialog_OK);
-		AptDialogOkButton     ->     makeReturnDefault(TRUE);
-
-		AptDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
-		AptDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
-		AptDialogCancelButton ->     setCallback (AptDialog_Cancel);
-
-		AptDialogResetButton  =  new puOneShot   (240, 10, 300, 50);
-		AptDialogResetButton  ->     setLegend   (gui_msg_RESET);
-		AptDialogResetButton  ->     setCallback (AptDialog_Reset);
-	}
-	cout << "NewAirportInit " << NewAirportId << endl;
-	FG_FINALIZE_PUI_DIALOG( AptDialog );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    int len = 150
+        - puGetDefaultLabelFont().getStringWidth( NewAirportLabel ) / 2;
+
+    AptDialog = new puDialogBox (150, 50);
+    {
+        AptDialogFrame   = new puFrame           (0,0,350, 150);
+        AptDialogMessage = new puText            (len, 110);
+        AptDialogMessage ->    setLabel          (NewAirportLabel);
+
+        AptDialogInput   = new puInput           (50, 70, 300, 100);
+        AptDialogInput   ->    setValue          (NewAirportId);
+        AptDialogInput   ->    acceptInput();
+
+        AptDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
+        AptDialogOkButton     ->     setLegend   (gui_msg_OK);
+        AptDialogOkButton     ->     setCallback (AptDialog_OK);
+        AptDialogOkButton     ->     makeReturnDefault(TRUE);
+
+        AptDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
+        AptDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
+        AptDialogCancelButton ->     setCallback (AptDialog_Cancel);
+
+        AptDialogResetButton  =  new puOneShot   (240, 10, 300, 50);
+        AptDialogResetButton  ->     setLegend   (gui_msg_RESET);
+        AptDialogResetButton  ->     setCallback (AptDialog_Reset);
+    }
+    cout << "NewAirportInit " << NewAirportId << endl;
+    FG_FINALIZE_PUI_DIALOG( AptDialog );
 }