Merge branch 'dev' into new-flightplan
This commit is contained in:
commit
e77766f3ed
3 changed files with 10 additions and 10 deletions
|
@ -304,9 +304,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();
|
||||
|
|
|
@ -687,9 +687,9 @@ var canvas_pfd = {
|
|||
}),
|
||||
props.UpdateManager.FromHashList(["altimeterHpa","altimeterInhg","altimeterInhgMode"], 0.005, func(val) {
|
||||
if (val.altimeterInhgMode == 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) {
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-x="1592"
|
||||
inkscape:cy="639.31164"
|
||||
inkscape:cx="1047.0778"
|
||||
inkscape:zoom="2.8284272"
|
||||
inkscape:cy="700.39821"
|
||||
inkscape:cx="666.95147"
|
||||
inkscape:zoom="0.50000001"
|
||||
showgrid="false"
|
||||
id="namedview371"
|
||||
inkscape:window-height="1017"
|
||||
|
@ -6778,8 +6778,8 @@
|
|||
inkscape:label="#g4757"
|
||||
id="ASI_frame">
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="M 13.168124,235.4451 H 154.46884"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 13.168124,235.4451 141.300876,0"
|
||||
id="path1062"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
@ -6787,7 +6787,7 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path922"
|
||||
d="M 13.167811,790.62913 H 121.24725"
|
||||
d="m 13.167811,790.62913 141.301189,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
</g>
|
||||
<text
|
||||
|
|
Before Width: | Height: | Size: 401 KiB After Width: | Height: | Size: 401 KiB |
Loading…
Add table
Reference in a new issue