Merge branch 'master' into nws-force
This commit is contained in:
commit
5d4d11868c
4 changed files with 18 additions and 12 deletions
|
@ -19,6 +19,7 @@ var ASItrgtdiff = 0;
|
|||
var ASImax = 0;
|
||||
var ASItrend = 0;
|
||||
var altTens = 0;
|
||||
var altPolarity = "";
|
||||
|
||||
# Fetch nodes:
|
||||
var state1 = props.globals.getNode("/systems/thrust/state1", 1);
|
||||
|
@ -807,7 +808,12 @@ var canvas_PFD_base = {
|
|||
me["ALT_two"].setText(sprintf("%03d", abs(me.middleAltText-5)));
|
||||
me["ALT_one"].setText(sprintf("%03d", abs(me.middleAltText-10)));
|
||||
|
||||
me["ALT_digits"].setText(sprintf("%s", altitude_pfd.getValue()));
|
||||
if (altitude.getValue() < 0) {
|
||||
altPolarity = "-";
|
||||
} else {
|
||||
altPolarity = "";
|
||||
}
|
||||
me["ALT_digits"].setText(sprintf("%s%d", altPolarity, altitude_pfd.getValue()));
|
||||
altTens = num(right(sprintf("%02d", altitude.getValue()), 2));
|
||||
me["ALT_tens"].setTranslation(0, altTens * 1.392);
|
||||
|
||||
|
|
|
@ -276,7 +276,7 @@ setlistener("/options/steep-ils", func {
|
|||
|
||||
canvas.Text._lastText = canvas.Text["_lastText"];
|
||||
canvas.Text.setText = func(text) {
|
||||
if (text == me._lastText) {return me;}
|
||||
if (text == me._lastText and text != nil and size(text) == size(me._lastText)) {return me;}
|
||||
me._lastText = text;
|
||||
me.set("text", typeof(text) == 'scalar' ? text : "");
|
||||
};
|
||||
|
|
|
@ -125,7 +125,7 @@
|
|||
<expression>
|
||||
<floor>
|
||||
<div>
|
||||
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
|
||||
<abs><property>/instrumentation/altimeter/indicated-altitude-ft</property></abs>
|
||||
<value>100</value>
|
||||
</div>
|
||||
</floor>
|
||||
|
|
|
@ -1 +1 @@
|
|||
4724
|
||||
4725
|
Reference in a new issue