Lower receiver sensitivity, modify loading of antenna pattern

diff --git a/src/Radio/antenna.cxx b/src/Radio/antenna.cxx
index 6fc7fd45b574cfee69b49a99b3c61cc4fd7bd267..2be67f351132458790b2ea12df0044bd429c553a 100644 (file)
--- a/src/Radio/antenna.cxx
+++ b/src/Radio/antenna.cxx
@@ -39,6 +39,10 @@ FGRadioAntenna::FGRadioAntenna(string type) {
 }
 
 FGRadioAntenna::~FGRadioAntenna() {
+       for (unsigned i =0; i < _pattern.size(); i++) {
+               AntennaGain *point_gain = _pattern[i];
+               delete point_gain;
+       }
        _pattern.clear();
        
 }
@@ -55,11 +59,11 @@ double FGRadioAntenna::calculate_gain(double bearing, double angle) {
        int elevation = (int)floor(angle);
        elevation += elevation % 2;
        cerr << "Bearing: " << bearing << " angle: " << angle << " azimuth: " << azimuth << " elevation: " << elevation << endl;
-       for (unsigned int i =0; i < _pattern.size(); i++) {
-               AntennaGain point_gain = _pattern[i];
+       for (unsigned i =0; i < _pattern.size(); i++) {
+               AntennaGain *point_gain = _pattern[i];
                
-               if ( (azimuth == point_gain.azimuth) && (elevation == point_gain.elevation)) {
-                       return point_gain.gain;
+               if ( (azimuth == point_gain->azimuth) && (elevation == point_gain->elevation)) {
+                       return point_gain->gain;
                }
        }
                
@@ -90,10 +94,10 @@ void FGRadioAntenna::load_antenna_pattern(string type) {
                        continue;
                }
                //cerr << "head: " << heading << " elev: " << elevation << " gain: " << gain << endl;
-               AntennaGain datapoint;
-               datapoint.azimuth = heading;
-               datapoint.elevation = 90.0 - fabs(elevation);
-               datapoint.gain = gain;
+               AntennaGain *datapoint = new AntennaGain;
+               datapoint->azimuth = heading;
+               datapoint->elevation = 90.0 - fabs(elevation);
+               datapoint->gain = gain;
                _pattern.push_back(datapoint);
        }
                

diff --git a/src/Radio/antenna.hxx b/src/Radio/antenna.hxx
index 81aad236769ea0b331d6c1c6486d7e9c43fe7ef8..0421a7f0cccb0c0220025390685b55685adb6277 100644 (file)
--- a/src/Radio/antenna.hxx
+++ b/src/Radio/antenna.hxx
@@ -44,7 +44,7 @@ private:
                double gain;
        };
        SGPath _pattern_file;
-       typedef std::vector<AntennaGain> AntennaPattern;
+       typedef std::vector<AntennaGain*> AntennaPattern;
        AntennaPattern _pattern;
        
 public:

diff --git a/src/Radio/radio.cxx b/src/Radio/radio.cxx
index 53e6c21f2ec24652906ab762a5fb92c6239e2ab3..efe77b413fa35de039fc07bb458fbbb35696dc2b 100644 (file)
--- a/src/Radio/radio.cxx
+++ b/src/Radio/radio.cxx
@@ -37,7 +37,7 @@
 FGRadioTransmission::FGRadioTransmission() {
        
        
-       _receiver_sensitivity = -110.0; // typical AM receiver sensitivity seems to be 0.8 microVolt at 12dB SINAD
+       _receiver_sensitivity = -105.0; // typical AM receiver sensitivity seems to be 0.8 microVolt at 12dB SINAD
        
        /** AM transmitter power in dBm.
        *       Typical output powers for ATC ground equipment, VHF-UHF:
@@ -362,15 +362,15 @@ double FGRadioTransmission::ITM_calculate_attenuation(SGGeod pos, double freq, i
        double num_points= (double)elevations.size();
 
 
-       _elevations.push_front(point_distance);
-       _elevations.push_front(num_points -1);
+       elevations.push_front(point_distance);
+       elevations.push_front(num_points -1);
 
-       int size = _elevations.size();
+       int size = elevations.size();
        double *itm_elev;
        itm_elev = new double[size];
 
        for(int i=0;i<size;i++) {
-               itm_elev[i]=_elevations[i];
+               itm_elev[i]=elevations[i];
                
 
        }