From f82b717c8b909894931f32ec1eb08c63361f81cb Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 11 Dec 2001 22:40:14 +0000 Subject: [PATCH] Norman's changes to display a scrolling "PAUSE" message when the simulation is paused. --- src/Autopilot/newauto.cxx | 7 ++++++- src/GUI/apt_dlg.cxx | 4 ++-- src/GUI/gui.cxx | 4 ++-- src/GUI/gui_local.cxx | 4 ++-- src/Main/fg_commands.cxx | 4 ++-- src/Main/fg_props.cxx | 11 ++++++++++- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx index 845e3be4f..a54eaf8fe 100644 --- a/src/Autopilot/newauto.cxx +++ b/src/Autopilot/newauto.cxx @@ -358,6 +358,9 @@ int FGAutopilot::run() { double lon = longitude_node->getDoubleValue(); double alt = altitude_node->getDoubleValue() * SG_FEET_TO_METER; + SG_LOG( SG_ALL, SG_DEBUG, "FGAutopilot::run() lat = " << lat << + " lon = " << lon << " alt = " << alt ); + #ifdef FG_FORCE_AUTO_DISENGAGE // see if somebody else has changed them if( fabs(aileron - old_aileron) > disengage_threshold || @@ -779,7 +782,9 @@ int FGAutopilot::run() { old_lat = lat; old_lon = lon; - // Ok, we are done + // Ok, we are done + SG_LOG( SG_ALL, SG_DEBUG, "FGAutopilot::run( returns )" ); + return 0; } diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx index 6a5581dd8..d7c0b6334 100644 --- a/src/GUI/apt_dlg.cxx +++ b/src/GUI/apt_dlg.cxx @@ -95,7 +95,7 @@ void AptDialog_OK (puObject *) fgSetPosFromAirportIDandHdg( AptId, cur_fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES); - BusyCursor(0); + // BusyCursor(0); fgReInitSubsystems(); // if ( global_tile_mgr.init() ) { // Load the local scenery data @@ -106,7 +106,7 @@ void AptDialog_OK (puObject *) // "Error in Tile Manager initialization!" ); // exit(-1); // } - BusyCursor(1); + // BusyCursor(1); } else { AptId += " not in database."; mkDialog(AptId.c_str()); diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index bf4afa4b2..7440c732f 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -723,7 +723,7 @@ void printScreen ( puObject *obj ) { show_pu_cursor = true; puHideCursor(); } - BusyCursor( 0 ); + // BusyCursor( 0 ); mainMenuBar->hide(); CGlPrinter p( CGlPrinter::PRINT_BITMAP ); @@ -735,7 +735,7 @@ void printScreen ( puObject *obj ) { if( gui_menu_on ) { mainMenuBar->reveal(); } - BusyCursor(1); + // BusyCursor(1); if ( show_pu_cursor ) { puShowCursor(); } diff --git a/src/GUI/gui_local.cxx b/src/GUI/gui_local.cxx index 1506577c5..37b3d3b4c 100644 --- a/src/GUI/gui_local.cxx +++ b/src/GUI/gui_local.cxx @@ -51,7 +51,7 @@ void initMouseQuat(void) { void reInit(puObject *cb) { - BusyCursor(0); + // BusyCursor(0); Quat0(); int freeze = globals->get_freeze(); @@ -86,7 +86,7 @@ void reInit(puObject *cb) fgReshape( xsize, ysize ); - BusyCursor(1); + // BusyCursor(1); if ( !freeze ) { globals->set_freeze( false ); diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx index b6bf7f043..77b9aedf7 100644 --- a/src/Main/fg_commands.cxx +++ b/src/Main/fg_commands.cxx @@ -271,7 +271,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state) SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache"); if ( !freeze ) globals->set_freeze( true ); - BusyCursor(0); + // BusyCursor(0); if ( global_tile_mgr.init() ) { // Load the local scenery data global_tile_mgr.update(fgGetDouble("/position/longitude-deg"), @@ -281,7 +281,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state) "Error in Tile Manager initialization!" ); exit(-1); } - BusyCursor(1); + // BusyCursor(1); if ( !freeze ) globals->set_freeze( false ); return true; diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx index 1710a01a3..a51b9750f 100644 --- a/src/Main/fg_props.cxx +++ b/src/Main/fg_props.cxx @@ -28,6 +28,7 @@ #include STL_IOSTREAM +#include #include #include #include