fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A32X: Further Canvas PFD Improvements

Browse source
This commit is contained in:
Joshua Davidson 2017-11-03 20:50:10 -04:00
parent b41cac2f56
commit 260efae1f7
2 changed files with 77 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Models/Instruments/PFD-WIP/PFD1.nas
View file

@ -40,6 +40,7 @@ var wow1 = getprop("/gear/gear[1]/wow");
var wow2 = getprop("/gear/gear[2]/wow");
var pitch = 0;
var roll = 0;
var spdTrend_c = 0;
var canvas_PFD_base = {
init: func(canvas_group, file) {
@ -104,7 +105,7 @@ var canvas_PFD_1 = {
getKeys: func() {
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr",
"FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1",
"FMA_Middle2","ASI_scale","ASI_target","AI_center","AI_bank","AI_slipskid","AI_horizon","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer","HDG_target"];
"FMA_Middle2","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","AI_center","AI_bank","AI_slipskid","AI_horizon","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer","HDG_target"];
},
update: func() {
state1 = getprop("/systems/thrust/state1");
@ -316,6 +317,20 @@ var canvas_PFD_1 = {
}
me["ASI_scale"].setTranslation(0, ASI * 6.6);
if (getprop("/instrumentation/airspeed-indicator/indicated-mach") >= 0.5) {
me["ASI_mach_decimal"].show();
me["ASI_mach"].show();
} else {
me["ASI_mach_decimal"].hide();
me["ASI_mach"].hide();
}
if (getprop("/instrumentation/airspeed-indicator/indicated-mach") >= 0.999) {
me["ASI_mach"].setText("999");
} else {
me["ASI_mach"].setText(sprintf("%3.0f", getprop("/instrumentation/airspeed-indicator/indicated-mach") * 1000));
}
if (getprop("/it-autoflight/input/spd-managed") == 1) {
me["ASI_target"].setColor(0.6745,0.3529,0.6823);
} else {
@ -331,6 +346,8 @@ var canvas_PFD_1 = {
}
me["ASI_target"].setTranslation(0, ASItrgt * -6.6);
me["ASI_ten_sec"].hide();
# Attitude Indicator
pitch = getprop("/orientation/pitch-deg") or 0;
roll = getprop("/orientation/roll-deg") or 0;

62
Models/Instruments/PFD-WIP/res/pfd.svg
View file

@ -42,9 +42,9 @@
inkscape:window-height="1030"
id="namedview371"
showgrid="true"
inkscape:zoom="1.9999999"
inkscape:cx="883.52684"
inkscape:cy="505.11595"
inkscape:zoom="0.49999998"
inkscape:cx="233.73297"
inkscape:cy="712.25986"
inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@ -2866,4 +2866,60 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc"
inkscape:label="#rect902" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4653"
d="m 98.207664,512.82646 45.617046,0"
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:4.79993105;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<g
id="ASI_ten_sec"
inkscape:label="#g4646"
transform="matrix(1,0,0,-1,0.21440023,1027.5828)"
style="stroke:#bfcc2a;stroke-opacity:1">
<path
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:3.5999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 101.56619,514.15641 0,66.47209"
id="path4632"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4642"
d="m 90.2872,560.82534 11.2792,20.70316"
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="M 112.8456,560.82534 101.5664,581.5285"
id="path4644"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<text
inkscape:label="#text975"
transform="scale(0.95383277,1.0484018)"
id="ASI_mach"
y="833.22681"
x="69.848434"
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83483124px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="833.22681"
x="69.848434"
id="tspan4664"
sodipodi:role="line">000</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:0.75"
x="45.718079"
y="833.22681"
id="ASI_mach_decimal"
transform="scale(0.95383277,1.0484018)"
inkscape:label="#text975"><tspan
sodipodi:role="line"
id="tspan4668"
x="45.718079"
y="833.22681"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83483124px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#11ba50;fill-opacity:1;stroke-width:0.75">.</tspan></text>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 363 KiB