fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Curtis L. Olson 2011-12-06 09:49:27 -06:00
commit c8bd588e9f
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
projects/VC90/FlightGear/FlightGear.vcproj
View file

@ -3198,6 +3198,30 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Lib_Radio"
>
<File
RelativePath="..\..\..\src\Radio\antenna.cxx"
>
</File>
<File
RelativePath="..\..\..\src\Radio\antenna.hxx"
>
</File>
<File
RelativePath="..\..\..\src\Radio\radio.cxx"
>
</File>
<File
RelativePath="..\..\..\src\Radio\radio.hxx"
>
</File>
<File
RelativePath="..\..\..\src\Radio\itm.cpp"
>
</File>
</Filter>
<Filter <Filter
Name="Lib_Scenery" Name="Lib_Scenery"
> >

2
src/Radio/itm.cpp
View file

@ -1000,7 +1000,7 @@ double avar(double zzt, double zzl, double zzc, prop_type &prop, propv_type &pro
kdv = propv.mdvar; kdv = propv.mdvar;
no_situation_variability = kdv >= 20; no_situation_variability = kdv >= 20;
if (no_situation_variability) if (no_situation_variability)
no_situation_variability -= 20; kdv -= 20;
no_location_variability = kdv >= 10; no_location_variability = kdv >= 10;
if (no_location_variability) if (no_location_variability)

8
src/Radio/radio.cxx
View file

@ -362,8 +362,10 @@ double FGRadioTransmission::ITM_calculate_attenuation(SGGeod pos, double freq, i
_elevations.push_front(point_distance); _elevations.push_front(point_distance);
_elevations.push_front(num_points -1); _elevations.push_front(num_points -1);
int size = _elevations.size();
double itm_elev[size]; int size = _elevations.size();
double itm_elev[10000];
for(int i=0;i<size;i++) { for(int i=0;i<size;i++) {
itm_elev[i]=_elevations[i]; itm_elev[i]=_elevations[i];
//cerr << "ITM:: itm_elev: " << _elevations[i] << endl; //cerr << "ITM:: itm_elev: " << _elevations[i] << endl;
@ -922,7 +924,7 @@ double FGRadioTransmission::watt_to_dbm(double power_watt) {
} }
double FGRadioTransmission::dbm_to_watt(double dbm) { double FGRadioTransmission::dbm_to_watt(double dbm) {
return exp( (dbm-30) * log(10) / 10); // returns Watts return exp( (dbm-30) * log(10.0) / 10.0); // returns Watts
} }
double FGRadioTransmission::dbm_to_microvolt(double dbm) { double FGRadioTransmission::dbm_to_microvolt(double dbm) {