]> git.mxchange.org Git - flightgear.git/commitdiff
Merge branch 'attenuation' into navaids-radio
authoradrian <adrian@localhost.com>
Tue, 6 Dec 2011 08:27:03 +0000 (10:27 +0200)
committeradrian <adrian@localhost.com>
Tue, 6 Dec 2011 08:27:03 +0000 (10:27 +0200)
Conflicts:
src/Radio/radio.cxx

1  2 
src/Radio/radio.cxx

index fd6520a8839ef77f001992fec2967a21a0a64c90,fba50474664de132996cc9db3792307b13bc2b2a..53e6c21f2ec24652906ab762a5fb92c6239e2ab3
@@@ -359,17 -358,20 +359,22 @@@ double FGRadioTransmission::ITM_calcula
        }
        
        
 -      double num_points= (double)_elevations.size();
 +      double num_points= (double)elevations.size();
 +
-       elevations.push_front(point_distance);
-       elevations.push_front(num_points -1);
-       int size = elevations.size();
-       double itm_elev[size];
+       _elevations.push_front(point_distance);
+       _elevations.push_front(num_points -1);
+       int size = _elevations.size();
+       double *itm_elev;
+       itm_elev = new double[size];
        for(int i=0;i<size;i++) {
-               itm_elev[i]=elevations[i];
-               //cerr << "ITM:: itm_elev: " << elevations[i] << endl;
-       }
+               itm_elev[i]=_elevations[i];
+               
 +
+       }
+       
        if((transmission_type == 3) || (transmission_type == 4)) {
                // the sender and receiver roles are switched
                point_to_point(itm_elev, receiver_height, transmitter_height,
        _root_node->setDoubleValue("station[0]/field-strength-uV", field_strength_uV);
        _root_node->setDoubleValue("station[0]/signal", signal);
        _root_node->setDoubleValue("station[0]/tx-erp", tx_erp);
++
 +      //_root_node->setDoubleValue("station[0]/tx-pattern-gain", tx_pattern_gain);
 +      //_root_node->setDoubleValue("station[0]/rx-pattern-gain", rx_pattern_gain);
++
+       delete[] itm_elev;
++
        return signal;
  
  }