fly/fgdata
1
0
Fork 0
Code Activity

Fix of previos canvas mod, PLAN mode change

Browse source
This commit is contained in:
Hyde Yamakawa 2014-02-23 13:43:54 -05:00
parent 745874315b
commit 3b9b9988ad
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Nasal/canvas/map/navdisplay.mfd
View file

@ -597,7 +597,7 @@ var NDStyles = {
id:'windArrow', id:'windArrow',
impl: { impl: {
init: func(nd,symbol), init: func(nd,symbol),
predicate: func(nd) (!(nd.in_mode('toggle_display_mode', ['PLAN']) and (nd.get_switch('toggle_display_type') == "LCD")) and nd.aircraft_source.get_spd() > 80), predicate: func(nd) (!(nd.in_mode('toggle_display_mode', ['PLAN']) and (nd.get_switch('toggle_display_type') == "LCD")) and nd.aircraft_source.get_spd() > 100),
is_true: func(nd) { is_true: func(nd) {
nd.symbols.windArrow.show(); nd.symbols.windArrow.show();
var windArrowRot = getprop("environment/wind-from-heading-deg"); var windArrowRot = getprop("environment/wind-from-heading-deg");
@ -691,7 +691,7 @@ var default_switches = {
'toggle_display_type': {path: '/mfd/display-type', value:'CRT', type:'STRING'}, # valid values are: CRT or LCD 'toggle_display_type': {path: '/mfd/display-type', value:'CRT', type:'STRING'}, # valid values are: CRT or LCD
'toggle_true_north': {path: '/mfd/true-north', value:0, type:'BOOL'}, 'toggle_true_north': {path: '/mfd/true-north', value:0, type:'BOOL'},
'toggle_rangearc': {path: '/mfd/rangearc', value:0, type:'BOOL'}, 'toggle_rangearc': {path: '/mfd/rangearc', value:0, type:'BOOL'},
'toggle_track_heading': {path: '/hdg-trk-switch', value:0, type:'BOOL'}, 'toggle_track_heading': {path: '/trk-selected', value:0, type:'BOOL'},
}; };
# Hack to update weather radar once every 10 seconds # Hack to update weather radar once every 10 seconds
@ -1007,9 +1007,11 @@ var NavDisplay = {
or (me.get_switch('toggle_track_heading') and me.get_switch('toggle_display_type') == "LCD")) or (me.get_switch('toggle_track_heading') and me.get_switch('toggle_display_type') == "LCD"))
{ {
userHdgTrk = userTrk; userHdgTrk = userTrk;
userHdgTrkTru = userTrkTru;
me.symbols.hdgTrk.setText("TRK"); me.symbols.hdgTrk.setText("TRK");
} else { } else {
userHdgTrk = userHdg; userHdgTrk = userHdg;
userHdgTrkTru = userHdgTru;
me.symbols.hdgTrk.setText("HDG"); me.symbols.hdgTrk.setText("HDG");
} }
@ -1121,33 +1123,28 @@ var NavDisplay = {
if((me.in_mode('toggle_display_mode', ['MAP']) and me.get_switch('toggle_display_type') == "CRT") if((me.in_mode('toggle_display_mode', ['MAP']) and me.get_switch('toggle_display_type') == "CRT")
or (me.get_switch('toggle_track_heading') and me.get_switch('toggle_display_type') == "LCD")) or (me.get_switch('toggle_track_heading') and me.get_switch('toggle_display_type') == "LCD"))
{ {
var hdgBugRot = (vhdg_bug-userHdgTrk)*D2R;
me.symbols.selHdgLine.setRotation(hdgBugRot);
me.symbols.hdgBug.setRotation(hdgBugRot);
me.symbols.hdgBug2.setRotation(hdgBugRot);
me.symbols.selHdgLine2.setRotation(hdgBugRot);
me.symbols.trkInd.setRotation(0); me.symbols.trkInd.setRotation(0);
me.symbols.trkInd2.setRotation(0); me.symbols.trkInd2.setRotation(0);
me.symbols.curHdgPtr.setRotation((userHdg-userTrk)*D2R); me.symbols.curHdgPtr.setRotation((userHdg-userTrk)*D2R);
me.symbols.curHdgPtr2.setRotation((userHdg-userTrk)*D2R); me.symbols.curHdgPtr2.setRotation((userHdg-userTrk)*D2R);
me.symbols.compass.setRotation(-userHdgTrk*D2R);
me.symbols.compassApp.setRotation(-userHdgTrk*D2R);
me.map._node.getNode("hdg",1).setDoubleValue(userTrkTru);
} }
else else
{ {
me.symbols.trkInd.setRotation((userTrk-userHdg)*D2R);
me.symbols.trkInd2.setRotation((userTrk-userHdg)*D2R);
me.symbols.curHdgPtr.setRotation(0);
me.symbols.curHdgPtr2.setRotation(0);
}
if(!me.in_mode('toggle_display_mode', ['PLAN']))
{
var hdgBugRot = (vhdg_bug-userHdgTrk)*D2R; var hdgBugRot = (vhdg_bug-userHdgTrk)*D2R;
me.symbols.selHdgLine.setRotation(hdgBugRot); me.symbols.selHdgLine.setRotation(hdgBugRot);
me.symbols.hdgBug.setRotation(hdgBugRot); me.symbols.hdgBug.setRotation(hdgBugRot);
me.symbols.hdgBug2.setRotation(hdgBugRot); me.symbols.hdgBug2.setRotation(hdgBugRot);
me.symbols.selHdgLine2.setRotation(hdgBugRot); me.symbols.selHdgLine2.setRotation(hdgBugRot);
me.symbols.trkInd.setRotation((userTrk-userHdg)*D2R);
me.symbols.trkInd2.setRotation((userTrk-userHdg)*D2R);
me.symbols.curHdgPtr.setRotation(0);
me.symbols.curHdgPtr2.setRotation(0);
me.symbols.compass.setRotation(-userHdgTrk*D2R); me.symbols.compass.setRotation(-userHdgTrk*D2R);
me.symbols.compassApp.setRotation(-userHdgTrk*D2R); me.symbols.compassApp.setRotation(-userHdgTrk*D2R);
me.map._node.getNode("hdg",1).setDoubleValue(userHdgTru); me.map._node.getNode("hdg",1).setDoubleValue(userHdgTrkTru);
} }
if(me.get_switch('toggle_centered')) { if(me.get_switch('toggle_centered')) {
if (me.in_mode('toggle_display_mode', ['APP','VOR'])) if (me.in_mode('toggle_display_mode', ['APP','VOR']))
@ -1288,7 +1285,7 @@ var NavDisplay = {
altRangePx = 700; altRangePx = 700;
me.symbols.altArc.setTranslation(0,-altRangePx); me.symbols.altArc.setTranslation(0,-altRangePx);
} }
me.symbols.altArc.show(); me.symbols.altArc.setVisible(me.in_mode('toggle_display_mode', ['MAP']) and !me.get_switch('toggle_centered'));
} else } else
me.symbols.altArc.hide(); me.symbols.altArc.hide();
} else { } else {