fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2012-08-12 03:42:50 +02:00
commit eda3232dc4
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Environment/metarinterpolator.xml
View file

@ -419,13 +419,23 @@
<condition> <condition>
<property>/environment/params/metar-updates-snow-level</property> <property>/environment/params/metar-updates-snow-level</property>
<property>/environment/params/metar-updates-environment</property> <property>/environment/params/metar-updates-environment</property>
<property>/environment/metar/snow-cover</property>
<property>/environment/metar/valid</property>
<less-than>
<expression>
<difference>
<product>
<property>/environment/metar/station-elevation-ft</property>
<value>0.3048</value>
</product>
<property>/environment/snow-level-m</property>
</difference>
</expression>
<value>0</value>
</less-than>
</condition> </condition>
</enable> </enable>
<input> <input>
<condition>
<property>/environment/metar/valid</property>
<property>/environment/metar/snow-cover</property>
</condition>
<expression> <expression>
<sum> <sum>
<product> <product>
@ -438,6 +448,7 @@
</input> </input>
<input>3200</input> <input>3200</input>
<output>/environment/snow-level-m</output> <output>/environment/snow-level-m</output>
<max>3200</max> <min>-425</min>
<max>7500</max>
</filter> </filter>
</PropertyList> </PropertyList>

2
Nasal/gui.nas
View file

@ -904,7 +904,7 @@ var showWeightDialog = func {
if( fdmdata.cg != nil ) { if( fdmdata.cg != nil ) {
var n = props.globals.getNode("/limits/mass-and-balance/cg/dimension"); var n = props.globals.getNode("/limits/mass-and-balance/cg/dimension");
tablerow("Center of Gravity", fdmdata.cg, "%.1f " ~ (n == nil ? "in" : n.getValue())); tablerow("Center of Gravity", props.globals.getNode(fdmdata.cg), "%.1f " ~ (n == nil ? "in" : n.getValue()));
} }
dialog[name].addChild("hrule"); dialog[name].addChild("hrule");

2
gui/dialogs/environment-settings.xml
View file

@ -93,7 +93,7 @@
<col>0</col> <col>0</col>
<colspan>4</colspan> <colspan>4</colspan>
<halign>left</halign> <halign>left</halign>
<label>Set snow level from METAR</label> <label>Set maximum snow level from METAR</label>
<name>metar-snow</name> <name>metar-snow</name>
<property>/environment/params/metar-updates-snow-level</property> <property>/environment/params/metar-updates-snow-level</property>
<binding> <binding>