fly/flightgear
1
0
Fork 0
Code Activity

Norman's changes to display a scrolling "PAUSE" message when the simulation

Browse source 
is paused.
This commit is contained in:
curt 2001-12-11 22:40:14 +00:00
parent 33f766aa33
commit f82b717c8b
6 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Autopilot/newauto.cxx
View file

@ -358,6 +358,9 @@ int FGAutopilot::run() {
double lon = longitude_node->getDoubleValue(); double lon = longitude_node->getDoubleValue();
double alt = altitude_node->getDoubleValue() * SG_FEET_TO_METER; 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 #ifdef FG_FORCE_AUTO_DISENGAGE
// see if somebody else has changed them // see if somebody else has changed them
if( fabs(aileron - old_aileron) > disengage_threshold || if( fabs(aileron - old_aileron) > disengage_threshold ||
@ -779,7 +782,9 @@ int FGAutopilot::run() {
old_lat = lat; old_lat = lat;
old_lon = lon; old_lon = lon;
// Ok, we are done // Ok, we are done
SG_LOG( SG_ALL, SG_DEBUG, "FGAutopilot::run( returns )" );
return 0; return 0;
} }

4
src/GUI/apt_dlg.cxx
View file

@ -95,7 +95,7 @@ void AptDialog_OK (puObject *)
fgSetPosFromAirportIDandHdg( AptId, fgSetPosFromAirportIDandHdg( AptId,
cur_fdm_state->get_Psi() * cur_fdm_state->get_Psi() *
SGD_RADIANS_TO_DEGREES); SGD_RADIANS_TO_DEGREES);
BusyCursor(0); // BusyCursor(0);
fgReInitSubsystems(); fgReInitSubsystems();
// if ( global_tile_mgr.init() ) { // if ( global_tile_mgr.init() ) {
// Load the local scenery data // Load the local scenery data
@ -106,7 +106,7 @@ void AptDialog_OK (puObject *)
// "Error in Tile Manager initialization!" ); // "Error in Tile Manager initialization!" );
// exit(-1); // exit(-1);
// } // }
BusyCursor(1); // BusyCursor(1);
} else { } else {
AptId += " not in database."; AptId += " not in database.";
mkDialog(AptId.c_str()); mkDialog(AptId.c_str());

4
src/GUI/gui.cxx
View file

@ -723,7 +723,7 @@ void printScreen ( puObject *obj ) {
show_pu_cursor = true; show_pu_cursor = true;
puHideCursor(); puHideCursor();
} }
BusyCursor( 0 ); // BusyCursor( 0 );
mainMenuBar->hide(); mainMenuBar->hide();
CGlPrinter p( CGlPrinter::PRINT_BITMAP ); CGlPrinter p( CGlPrinter::PRINT_BITMAP );
@ -735,7 +735,7 @@ void printScreen ( puObject *obj ) {
if( gui_menu_on ) { if( gui_menu_on ) {
mainMenuBar->reveal(); mainMenuBar->reveal();
} }
BusyCursor(1); // BusyCursor(1);
if ( show_pu_cursor ) { if ( show_pu_cursor ) {
puShowCursor(); puShowCursor();
} }

4
src/GUI/gui_local.cxx
View file

@ -51,7 +51,7 @@ void initMouseQuat(void) {
void reInit(puObject *cb) void reInit(puObject *cb)
{ {
BusyCursor(0); // BusyCursor(0);
Quat0(); Quat0();
int freeze = globals->get_freeze(); int freeze = globals->get_freeze();
@ -86,7 +86,7 @@ void reInit(puObject *cb)
fgReshape( xsize, ysize ); fgReshape( xsize, ysize );
BusyCursor(1); // BusyCursor(1);
if ( !freeze ) { if ( !freeze ) {
globals->set_freeze( false ); globals->set_freeze( false );

4
src/Main/fg_commands.cxx
View file

@ -271,7 +271,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache"); SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache");
if ( !freeze ) if ( !freeze )
globals->set_freeze( true ); globals->set_freeze( true );
BusyCursor(0); // BusyCursor(0);
if ( global_tile_mgr.init() ) { if ( global_tile_mgr.init() ) {
// Load the local scenery data // Load the local scenery data
global_tile_mgr.update(fgGetDouble("/position/longitude-deg"), 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!" ); "Error in Tile Manager initialization!" );
exit(-1); exit(-1);
} }
BusyCursor(1); // BusyCursor(1);
if ( !freeze ) if ( !freeze )
globals->set_freeze( false ); globals->set_freeze( false );
return true; return true;

11
src/Main/fg_props.cxx
View file

@ -28,6 +28,7 @@
#include STL_IOSTREAM #include STL_IOSTREAM
#include <ATC/ATCdisplay.hxx>
#include <Autopilot/newauto.hxx> #include <Autopilot/newauto.hxx>
#include <Aircraft/aircraft.hxx> #include <Aircraft/aircraft.hxx>
#include <Time/tmp.hxx> #include <Time/tmp.hxx>
@ -278,7 +279,15 @@ getFreeze ()
static void static void
setFreeze (bool freeze) setFreeze (bool freeze)
{ {
globals->set_freeze(freeze); globals->set_freeze(freeze);
if ( freeze ) {
// BusyCursor( 0 );
current_atcdisplay->CancelRepeatingMessage();
current_atcdisplay->RegisterRepeatingMessage("**** SIM IS PAUSED **** SIM IS PAUSED ****");
} else {
// BusyCursor( 1 );
current_atcdisplay->CancelRepeatingMessage();
}
} }
/** /**