fly/fgdata
1
0
Fork 0
Code Activity

Merge /u/tikibar/flightgear/ branch canvas_tacan into next

Browse source 
http://sourceforge.net/p/flightgear/fgdata/merge-requests/22/
This commit is contained in:
Torsten Dreyer 2015-06-09 07:12:46 +00:00
commit dabaeea9fa
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Nasal/canvas/map/navdisplay.styles
View file

@ -950,8 +950,7 @@ var NDStyles = {
id:'TCNArrow',
impl: {
init: func(nd,symbol),
# predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and !nd.get_switch('toggle_centered') and getprop("instrumentation/efis/enable-canvas-tacan-display")),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and !nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and !nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TCNArrow.show();
@ -967,7 +966,7 @@ var NDStyles = {
id:'TCNArrow2',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TCNArrow2.show();
@ -983,7 +982,7 @@ var NDStyles = {
id:'TACAN',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TACAN.setText("TACAN");
@ -999,7 +998,7 @@ var NDStyles = {
id:'TACANId',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
nd.symbols.TACANId.setText(getprop("instrumentation/tacan/ident"));
@ -1015,7 +1014,7 @@ var NDStyles = {
id:'TACANdme',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
nd.symbols.TACANdme.setText("DIST");
@ -1031,7 +1030,7 @@ var NDStyles = {
id:'TACANdmeDist',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
nd.symbols.TACANdmeDist.setText(sprintf("%3.1f",getprop("instrumentation/tacan/indicated-distance-nm")));