1
0
Fork 0

Merge branch 'dev' into 3D

This commit is contained in:
Jonathan Redpath 2022-05-14 14:24:39 +01:00
commit 1b5cf68c37
3 changed files with 4 additions and 13 deletions

View file

@ -6,15 +6,6 @@
<PropertyList>
<nasal>
<close>
<![CDATA[
systems.FUEL.Nodes.requestLbs.setValue(0);
]]>
</close>
</nasal>
<name>fuel-dlg</name>
<layout>vbox</layout>

View file

@ -306,9 +306,9 @@ var canvas_IESI = {
me["QNH_std"].show();
} else {
if (pinPrograms.showInHg) {
me["QNH_setting"].setText(sprintf("%4.0f", notification.qnh_hpa_iesi) ~ "/" ~ sprintf("%2.2f", notification.qnh_inhg_iesi));
me["QNH_setting"].setText(sprintf("%4.0f", math.round(notification.qnh_hpa_iesi)) ~ "/" ~ sprintf("%2.2f", math.round(notification.qnh_inhg_iesi * 100) / 100));
} else {
me["QNH_setting"].setText(sprintf("%4.0f", notification.qnh_hpa_iesi));
me["QNH_setting"].setText(sprintf("%4.0f", math.round(notification.qnh_hpa_iesi)));
}
me["QNH_std"].hide();
me["QNH_setting"].show();

View file

@ -438,9 +438,9 @@ var canvas_pfd = {
}),
props.UpdateManager.FromHashList(["altimeterHpa","altimeterInhg","altimeterInhgModeLeft","altimeterInhgModeRight"], 0.005, func(val) {
if ((obj.number == 0 and val.altimeterInhgModeLeft == 0) or (obj.number == 1 and val.altimeterInhgModeRight == 0)) {
obj["QNH_setting"].setText(sprintf("%4d", val.altimeterHpa));
obj["QNH_setting"].setText(sprintf("%4d", math.round(val.altimeterHpa)));
} else {
obj["QNH_setting"].setText(sprintf("%2.2f", val.altimeterInhg));
obj["QNH_setting"].setText(sprintf("%2.2f", math.round(val.altimeterInhg * 100) / 100));
}
}),
props.UpdateManager.FromHashList(["altimeterStd","altitudeAutopilot"], 1, func(val) {