From: adrian <adrian@localhost.com>
Date: Tue, 6 Dec 2011 08:27:03 +0000 (+0200)
Subject: Merge branch 'attenuation' into navaids-radio
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a61ad0fc923e54d8eaf8ddcacf90a986c9f9241;p=flightgear.git

Merge branch 'attenuation' into navaids-radio

Conflicts:
	src/Radio/radio.cxx
---

8a61ad0fc923e54d8eaf8ddcacf90a986c9f9241
diff --cc src/Radio/radio.cxx
index fd6520a88,fba504746..53e6c21f2
--- a/src/Radio/radio.cxx
+++ b/src/Radio/radio.cxx
@@@ -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,
@@@ -430,8 -410,7 +435,12 @@@
  	_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;
  
  }