fly/flightgear
1
0
Fork 0
Code Activity

cosmetics:

Browse source 
- fix indentation
- remove trailing spaces
This commit is contained in:
mfranz 2006-06-24 07:48:05 +00:00
parent 095efc1fcf
commit 7647b1620b
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/Instrumentation/marker_beacon.cxx
View file

@ -72,7 +72,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
} else if ( cname == "number" ) { } else if ( cname == "number" ) {
num = child->getIntValue(); num = child->getIntValue();
} else { } else {
SG_LOG( SG_INSTR, SG_WARN, SG_LOG( SG_INSTR, SG_WARN,
"Error in marker beacon config logic" ); "Error in marker beacon config logic" );
if ( name.length() ) { if ( name.length() ) {
SG_LOG( SG_INSTR, SG_WARN, "Section = " << name ); SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
@ -83,7 +83,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
// Destructor // Destructor
FGMarkerBeacon::~FGMarkerBeacon() FGMarkerBeacon::~FGMarkerBeacon()
{ {
delete term_tbl; delete term_tbl;
delete low_tbl; delete low_tbl;
@ -128,13 +128,13 @@ FGMarkerBeacon::bind ()
branch = "/instrumentation/" + name; branch = "/instrumentation/" + name;
fgTie((branch + "/inner").c_str(), this, fgTie((branch + "/inner").c_str(), this,
&FGMarkerBeacon::get_inner_blink); &FGMarkerBeacon::get_inner_blink);
fgTie((branch + "/middle").c_str(), this, fgTie((branch + "/middle").c_str(), this,
&FGMarkerBeacon::get_middle_blink); &FGMarkerBeacon::get_middle_blink);
fgTie((branch + "/outer").c_str(), this, fgTie((branch + "/outer").c_str(), this,
&FGMarkerBeacon::get_outer_blink); &FGMarkerBeacon::get_outer_blink);
} }
@ -151,19 +151,19 @@ FGMarkerBeacon::unbind ()
// Update the various nav values based on position and valid tuned in navs // Update the various nav values based on position and valid tuned in navs
void void
FGMarkerBeacon::update(double dt) FGMarkerBeacon::update(double dt)
{ {
need_update = false; need_update = false;
if ( has_power() && serviceable->getBoolValue() if ( has_power() && serviceable->getBoolValue()
&& !sound_pause->getBoolValue()) { && !sound_pause->getBoolValue()) {
// On timeout, scan again // On timeout, scan again
_time_before_search_sec -= dt; _time_before_search_sec -= dt;
if ( _time_before_search_sec < 0 ) { if ( _time_before_search_sec < 0 ) {
search(); search();
} }
// marker beacon blinking // marker beacon blinking
bool light_on = ( outer_blink || middle_blink || inner_blink ); bool light_on = ( outer_blink || middle_blink || inner_blink );
SGTimeStamp current; SGTimeStamp current;
@ -208,16 +208,16 @@ static bool check_beacon_range( const SGGeod& pos,
{ {
SGVec3d aircraft = SGVec3d::fromGeod(pos); SGVec3d aircraft = SGVec3d::fromGeod(pos);
SGVec3d station = b->get_cart(); SGVec3d station = b->get_cart();
// cout << " aircraft = " << aircraft << " station = " << station // cout << " aircraft = " << aircraft << " station = " << station
// << endl; // << endl;
SGVec3d tmp = station - aircraft; SGVec3d tmp = station - aircraft;
double d = dot(tmp, tmp); double d = dot(tmp, tmp);
// cout << " distance = " << d << " (" // cout << " distance = " << d << " ("
// << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
// * FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER // * FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
// << ")" << endl; // << ")" << endl;
// cout << " range = " << sqrt(d) << endl; // cout << " range = " << sqrt(d) << endl;
// cout << "elev = " << elev * SG_METER_TO_FEET // cout << "elev = " << elev * SG_METER_TO_FEET
@ -248,7 +248,7 @@ static bool check_beacon_range( const SGGeod& pos,
} }
// Update current nav/adf radio stations based on current postition // Update current nav/adf radio stations based on current postition
void FGMarkerBeacon::search() void FGMarkerBeacon::search()
{ {
// reset search time // reset search time
@ -290,18 +290,18 @@ void FGMarkerBeacon::search()
if ( b == NULL || !inrange || !has_power() || !serviceable->getBoolValue() ) if ( b == NULL || !inrange || !has_power() || !serviceable->getBoolValue() )
{ {
// cout << "no marker" << endl; // cout << "no marker" << endl;
globals->get_soundmgr()->stop( "outer-marker" ); globals->get_soundmgr()->stop( "outer-marker" );
globals->get_soundmgr()->stop( "middle-marker" ); globals->get_soundmgr()->stop( "middle-marker" );
globals->get_soundmgr()->stop( "inner-marker" ); globals->get_soundmgr()->stop( "inner-marker" );
} else { } else {
string current_sound_name; string current_sound_name;
if ( beacon_type == OUTER ) { if ( beacon_type == OUTER ) {
outer_marker = true; outer_marker = true;
current_sound_name = "outer-marker"; current_sound_name = "outer-marker";
// cout << "OUTER MARKER" << endl; // cout << "OUTER MARKER" << endl;
if ( last_beacon != OUTER ) { if ( last_beacon != OUTER ) {
if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
SGSoundSample *sound = beacon.get_outer(); SGSoundSample *sound = beacon.get_outer();
@ -318,16 +318,16 @@ void FGMarkerBeacon::search()
globals->get_soundmgr()->stop( current_sound_name ); globals->get_soundmgr()->stop( current_sound_name );
} }
} else if ( beacon_type == MIDDLE ) { } else if ( beacon_type == MIDDLE ) {
middle_marker = true; middle_marker = true;
current_sound_name = "middle-marker"; current_sound_name = "middle-marker";
// cout << "MIDDLE MARKER" << endl; // cout << "MIDDLE MARKER" << endl;
if ( last_beacon != MIDDLE ) { if ( last_beacon != MIDDLE ) {
if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
SGSoundSample *sound = beacon.get_middle(); SGSoundSample *sound = beacon.get_middle();
if ( sound ) { if ( sound ) {
globals->get_soundmgr()->add( sound, current_sound_name ); globals->get_soundmgr()->add( sound, current_sound_name );
} }
} }
} }
if ( audio_btn->getBoolValue() ) { if ( audio_btn->getBoolValue() ) {
if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {
@ -337,16 +337,16 @@ void FGMarkerBeacon::search()
globals->get_soundmgr()->stop( current_sound_name ); globals->get_soundmgr()->stop( current_sound_name );
} }
} else if ( beacon_type == INNER ) { } else if ( beacon_type == INNER ) {
inner_marker = true; inner_marker = true;
current_sound_name = "inner-marker"; current_sound_name = "inner-marker";
// cout << "INNER MARKER" << endl; // cout << "INNER MARKER" << endl;
if ( last_beacon != INNER ) { if ( last_beacon != INNER ) {
if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
SGSoundSample *sound = beacon.get_inner(); SGSoundSample *sound = beacon.get_inner();
if ( sound ) { if ( sound ) {
globals->get_soundmgr()->add( sound, current_sound_name ); globals->get_soundmgr()->add( sound, current_sound_name );
} }
} }
} }
if ( audio_btn->getBoolValue() ) { if ( audio_btn->getBoolValue() ) {
if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {

8
src/Instrumentation/marker_beacon.hxx
View file

@ -76,10 +76,10 @@ class FGMarkerBeacon : public SGSubsystem
public: public:
enum fgMkrBeacType { enum fgMkrBeacType {
NOBEACON = 0, NOBEACON = 0,
INNER, INNER,
MIDDLE, MIDDLE,
OUTER OUTER
}; };
FGMarkerBeacon(SGPropertyNode *node); FGMarkerBeacon(SGPropertyNode *node);