From: mfranz Date: Fri, 25 Nov 2005 19:07:24 +0000 (+0000) Subject: cosmetics -- NO CODE CHANGE! X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f323c2e7eab00b6bb0ad10fb47a909406a84711d;p=flightgear.git cosmetics -- NO CODE CHANGE! remove trailing spaces fix very liberal indentation (logical block not indented at all, 5 spaces, ...) removed commented out code --- diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx index d06c6db4b..5df347a2b 100755 --- a/src/Instrumentation/tacan.cxx +++ b/src/Instrumentation/tacan.cxx @@ -50,11 +50,11 @@ TACAN::TACAN ( SGPropertyNode *node ) _transmitter_elevation_ft(0), _transmitter_range_nm(0), _transmitter_bias(0.0), - + name("tacan"), num(0) { - + int i; for ( i = 0; i < node->nChildren(); ++i ) { SGPropertyNode *child = node->getChild(i); @@ -120,51 +120,45 @@ TACAN::init () _bearing_node = node->getChild("indicated-bearing-true-deg", 0, true); _carrier_lat_node = fgGetNode("/ai/models/carrier/position/latitude-deg", true); _carrier_lon_node = fgGetNode("/ai/models/carrier/position/longitude-deg", true); -// _carrier_name_node = fgGetNode("/ai/models/carrier/name", true); - + SGPropertyNode *cnode = fgGetNode("/ai/models/carrier", num, true ); _carrier_name_node = cnode->getChild("name", 0, true); } void TACAN::update (double delta_time_sec) -{ - double az2 = 0; +{ + double az2 = 0; double bearing = 0; - double distance = 0; - double carrier_az2= 0; - double carrier_bearing = 0; + double distance = 0; + double carrier_az2= 0; + double carrier_bearing = 0; double carrier_distance = 0; double frequency_mhz = 0; string _channel, _last_channel, _channel_1, _channel_2,_channel_3, _channel_4; - // If it's off, don't waste any time. - if (!_serviceable_node->getBoolValue() || - !_electrical_node->getBoolValue() - ) { - _last_distance_nm = 0; - _in_range_node->setBoolValue(false); - _distance_node->setDoubleValue(0); - _speed_node->setDoubleValue(0); - _time_node->setDoubleValue(0); - SG_LOG( SG_INSTR, SG_DEBUG, "skip tacan " ); - return; - }else{ - //SG_LOG( SG_INSTR, SG_DEBUG, "run tacan " ); - } - + // If it's off, don't waste any time. + if (!_serviceable_node->getBoolValue() || !_electrical_node->getBoolValue()) { + _last_distance_nm = 0; + _in_range_node->setBoolValue(false); + _distance_node->setDoubleValue(0); + _speed_node->setDoubleValue(0); + _time_node->setDoubleValue(0); + SG_LOG( SG_INSTR, SG_DEBUG, "skip tacan" ); + return; + } + // Figure out the source const char * source = _source_node->getStringValue(); - + if (source[0] == '\0') { string branch; branch = "/instrumentation/" + name + "/frequencies/selected-channel"; - // branch = "/instrumentation/" + _name + "/frequencies/selected-mhz"; _source_node->setStringValue(branch.c_str()); source = _source_node->getStringValue(); - SG_LOG( SG_INSTR, SG_DEBUG, "source " << source ); + SG_LOG( SG_INSTR, SG_DEBUG, "source " << source ); } - // Get the channel + // Get the channel _channel_1 = fgGetString("/instrumentation/tacan/frequencies/selected-channel[1]"); _channel_2 = fgGetString("/instrumentation/tacan/frequencies/selected-channel[2]"); _channel_3 = fgGetString("/instrumentation/tacan/frequencies/selected-channel[3]"); @@ -172,7 +166,7 @@ TACAN::update (double delta_time_sec) SG_LOG( SG_INSTR, SG_DEBUG, "channels " << _channel_1 << _channel_2 << _channel_3 << _channel_4); _channel = _channel_1 + _channel_2 + _channel_3 + _channel_4; SG_LOG( SG_INSTR, SG_DEBUG, "channel " << _channel ); - + // Get the frequecncy if (_channel != _last_channel) { _time_before_search_sec = 0; @@ -180,60 +174,59 @@ TACAN::update (double delta_time_sec) frequency_mhz = searchChannel(_channel); SG_LOG( SG_INSTR, SG_DEBUG, "frequency " << frequency_mhz ); _frequency_node->setDoubleValue(frequency_mhz); - } - + } + // Get the aircraft position - double longitude_deg = _longitude_node->getDoubleValue(); - double latitude_deg = _latitude_node->getDoubleValue(); - double altitude_m = _altitude_node->getDoubleValue() * SG_FEET_TO_METER; - double longitude_rad = longitude_deg * SGD_DEGREES_TO_RADIANS; - double latitude_rad = latitude_deg * SGD_DEGREES_TO_RADIANS; - + double longitude_deg = _longitude_node->getDoubleValue(); + double latitude_deg = _latitude_node->getDoubleValue(); + double altitude_m = _altitude_node->getDoubleValue() * SG_FEET_TO_METER; + double longitude_rad = longitude_deg * SGD_DEGREES_TO_RADIANS; + double latitude_rad = latitude_deg * SGD_DEGREES_TO_RADIANS; + // On timeout, scan again _time_before_search_sec -= delta_time_sec; if (_time_before_search_sec < 0 && frequency_mhz > 0) - search(frequency_mhz, longitude_rad, - latitude_rad, altitude_m); + search(frequency_mhz, longitude_rad, latitude_rad, altitude_m); // Calculate the distance to the transmitter - - //calculate the bearing and range of the carrier from the aircraft - SG_LOG( SG_INSTR, SG_DEBUG, "carrier_lat " << _carrier_lat); - SG_LOG( SG_INSTR, SG_DEBUG, "carrier_lon " << _carrier_lon); - SG_LOG( SG_INSTR, SG_DEBUG, "carrier_name " << _carrier_name); - SG_LOG( SG_INSTR, SG_DEBUG, "carrier_valid " << _carrier_valid); - geo_inverse_wgs_84(altitude_m, - latitude_deg, - longitude_deg, - _carrier_lat, - _carrier_lon, - &carrier_bearing, &carrier_az2, &carrier_distance); - - - //calculate the bearing and range of the station from the aircraft - geo_inverse_wgs_84(altitude_m, - latitude_deg, - longitude_deg, - _transmitter_lat, - _transmitter_lon, - &bearing, &az2, &distance); - - - //select the nearer - if ( carrier_distance <= distance && _carrier_valid) { - SG_LOG( SG_INSTR, SG_DEBUG, "carrier_distance_nm " << carrier_distance); - SG_LOG( SG_INSTR, SG_DEBUG, "distance_nm " << distance); - bearing = carrier_bearing; - distance = carrier_distance; - _transmitter_elevation_ft = _carrier_elevation_ft; - _transmitter_range_nm = _carrier_range_nm; - _transmitter_bias = _carrier_bias; - _transmitter_name = _carrier_name; - _name_node->setStringValue(_transmitter_name.c_str()); - } - - double distance_nm = distance * SG_METER_TO_NM; - SG_LOG( SG_INSTR, SG_DEBUG, "distance_nm " << distance_nm << " bearing " << bearing); + + //calculate the bearing and range of the carrier from the aircraft + SG_LOG( SG_INSTR, SG_DEBUG, "carrier_lat " << _carrier_lat); + SG_LOG( SG_INSTR, SG_DEBUG, "carrier_lon " << _carrier_lon); + SG_LOG( SG_INSTR, SG_DEBUG, "carrier_name " << _carrier_name); + SG_LOG( SG_INSTR, SG_DEBUG, "carrier_valid " << _carrier_valid); + geo_inverse_wgs_84(altitude_m, + latitude_deg, + longitude_deg, + _carrier_lat, + _carrier_lon, + &carrier_bearing, &carrier_az2, &carrier_distance); + + + //calculate the bearing and range of the station from the aircraft + geo_inverse_wgs_84(altitude_m, + latitude_deg, + longitude_deg, + _transmitter_lat, + _transmitter_lon, + &bearing, &az2, &distance); + + + //select the nearer + if ( carrier_distance <= distance && _carrier_valid) { + SG_LOG( SG_INSTR, SG_DEBUG, "carrier_distance_nm " << carrier_distance); + SG_LOG( SG_INSTR, SG_DEBUG, "distance_nm " << distance); + bearing = carrier_bearing; + distance = carrier_distance; + _transmitter_elevation_ft = _carrier_elevation_ft; + _transmitter_range_nm = _carrier_range_nm; + _transmitter_bias = _carrier_bias; + _transmitter_name = _carrier_name; + _name_node->setStringValue(_transmitter_name.c_str()); + } + + double distance_nm = distance * SG_METER_TO_NM; + SG_LOG( SG_INSTR, SG_DEBUG, "distance_nm " << distance_nm << " bearing " << bearing); /*Point3D location = sgGeodToCart(Point3D(longitude_rad, latitude_rad, altitude_m)); @@ -257,7 +250,7 @@ TACAN::update (double delta_time_sec) _speed_node->setDoubleValue(speed_kt); _time_node->setDoubleValue(distance_nm/speed_kt*60.0); _bearing_node->setDoubleValue(bearing); - + } else { _last_distance_nm = 0; _in_range_node->setBoolValue(false); @@ -266,10 +259,9 @@ TACAN::update (double delta_time_sec) _time_node->setDoubleValue(0); _bearing_node->setDoubleValue(0); } - + // If we can't find a valid station set everything to zero - if (!_transmitter_valid && !_carrier_valid) - { + if (!_transmitter_valid && !_carrier_valid) { _in_range_node->setBoolValue(false); _distance_node->setDoubleValue(0); _speed_node->setDoubleValue(0); @@ -283,14 +275,14 @@ TACAN::update (double delta_time_sec) void TACAN::search (double frequency_mhz, double longitude_rad, - double latitude_rad, double altitude_m) -{ - + double latitude_rad, double altitude_m) +{ + SG_LOG( SG_INSTR, SG_DEBUG, "tacan freq " << frequency_mhz ); - + // reset search time _time_before_search_sec = 1.0; - + //try any carriers first FGNavRecord *carrier_tacan = globals->get_carrierlist()->findStationByFreq( frequency_mhz ); @@ -298,7 +290,7 @@ TACAN::search (double frequency_mhz, double longitude_rad, if ( _carrier_valid ) { SG_LOG( SG_INSTR, SG_DEBUG, "carrier transmitter valid " << _carrier_valid ); - + string str1( carrier_tacan->get_name() ); SGPropertyNode * branch = fgGetNode("ai/models", true); @@ -310,52 +302,49 @@ TACAN::search (double frequency_mhz, double longitude_rad, int i; for ( i = 0; i < number; ++i ) { - string str2 ( carrier[i]->getStringValue("name", "")); - // SG_LOG( SG_INSTR, SG_DEBUG, "carrier name " << str2 ); - - - //string str2 ( _carrier_name_node->getStringValue()); - SG_LOG( SG_INSTR, SG_DEBUG, "strings 1 " << str1 << " 2 " << str2 ); - unsigned int loc1= str1.find( str2, 0 ); - if( loc1 != string::npos && str2 != "" ){ - SG_LOG( SG_INSTR, SG_DEBUG, " string found" ); - _carrier_lat = _carrier_lat_node->getDoubleValue(); - _carrier_lon = _carrier_lon_node->getDoubleValue(); - _carrier_elevation_ft = carrier_tacan->get_elev_ft(); - _carrier_range_nm = carrier_tacan->get_range(); - _carrier_bias = carrier_tacan->get_multiuse(); - _carrier_name = carrier_tacan->get_name(); - _carrier_valid = 1; - SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter valid " << _carrier_valid ); - break; - } - else{ - _carrier_valid = 0; - SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter invalid " << _carrier_valid ); - } - } - + string str2 ( carrier[i]->getStringValue("name", "")); + // SG_LOG( SG_INSTR, SG_DEBUG, "carrier name " << str2 ); + + SG_LOG( SG_INSTR, SG_DEBUG, "strings 1 " << str1 << " 2 " << str2 ); + unsigned int loc1= str1.find( str2, 0 ); + if ( loc1 != string::npos && str2 != "" ) { + SG_LOG( SG_INSTR, SG_DEBUG, " string found" ); + _carrier_lat = _carrier_lat_node->getDoubleValue(); + _carrier_lon = _carrier_lon_node->getDoubleValue(); + _carrier_elevation_ft = carrier_tacan->get_elev_ft(); + _carrier_range_nm = carrier_tacan->get_range(); + _carrier_bias = carrier_tacan->get_multiuse(); + _carrier_name = carrier_tacan->get_name(); + _carrier_valid = 1; + SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter valid " << _carrier_valid ); + break; + } else { + _carrier_valid = 0; + SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter invalid " << _carrier_valid ); + } + } + //_name_node->setStringValue(_transmitter_name.c_str()); - + SG_LOG( SG_INSTR, SG_DEBUG, "name " << _carrier_name); SG_LOG( SG_INSTR, SG_DEBUG, "lat " << _carrier_lat << "lon " << _carrier_lon); SG_LOG( SG_INSTR, SG_DEBUG, "elev " << _carrier_elevation_ft); - + } else { - SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter invalid " << _carrier_valid ); - } - + SG_LOG( SG_INSTR, SG_DEBUG, " carrier transmitter invalid " << _carrier_valid ); + } + // try the TACAN/VORTAC list next FGNavRecord *tacan = globals->get_tacanlist()->findByFreq( frequency_mhz, longitude_rad, - latitude_rad, altitude_m); + latitude_rad, altitude_m); _transmitter_valid = (tacan != NULL); if ( _transmitter_valid ) { SG_LOG( SG_INSTR, SG_DEBUG, "transmitter valid " << _transmitter_valid ); - + _transmitter_lat = tacan->get_lat(); _transmitter_lon = tacan->get_lon(); _transmitter_elevation_ft = tacan->get_elev_ft(); @@ -363,33 +352,33 @@ TACAN::search (double frequency_mhz, double longitude_rad, _transmitter_bias = tacan->get_multiuse(); _transmitter_name = tacan->get_name(); _name_node->setStringValue(_transmitter_name.c_str()); - + SG_LOG( SG_INSTR, SG_DEBUG, "name " << _transmitter_name); SG_LOG( SG_INSTR, SG_DEBUG, "lat " << _transmitter_lat << "lon " << _transmitter_lon); SG_LOG( SG_INSTR, SG_DEBUG, "elev " << _transmitter_elevation_ft); - + } else { - SG_LOG( SG_INSTR, SG_DEBUG, "transmitter invalid " << _transmitter_valid ); - } - + SG_LOG( SG_INSTR, SG_DEBUG, "transmitter invalid " << _transmitter_valid ); + } } double TACAN::searchChannel (const string& _channel){ - + double frequency_khz = 0; - + FGTACANRecord *freq = globals->get_channellist()->findByChannel( _channel ); - double _freq_valid = (freq != NULL); + double _freq_valid = (freq != NULL); SG_LOG( SG_INSTR, SG_DEBUG, "freq valid " << _freq_valid ); if ( _freq_valid ) { frequency_khz = freq->get_freq(); SG_LOG( SG_INSTR, SG_DEBUG, "freq output " << frequency_khz ); //check sanity - if (frequency_khz >9620 && frequency_khz <= 12130)return frequency_khz/100; + if (frequency_khz >9620 && frequency_khz <= 12130) + return frequency_khz/100; } return frequency_khz = 0; } // end TACAN::searchChannel - + // end of TACAN.cxx