fly/fgdata
1
0
Fork 0
Code Activity

FG1000 - Fix 3D model GDUs, find nearest ID on DTO

Browse source
This commit is contained in:
Stuart Buchanan 2018-04-29 21:15:18 +01:00
parent 1b52eaccbd
commit 8fdffa16e6
17 changed files with 56 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
View file

@ -191,7 +191,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -300,6 +299,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -307,6 +307,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -719,7 +720,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
View file

@ -191,7 +191,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -300,6 +299,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -307,6 +307,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -719,7 +720,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
View file

@ -191,7 +191,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -300,6 +299,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -307,6 +307,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -719,7 +720,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
View file

@ -191,7 +191,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -300,6 +299,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -307,6 +307,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -719,7 +720,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>4</device> <device>4</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>4</device> <device>4</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
View file

@ -208,7 +208,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -557,6 +556,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -564,6 +564,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>1</device> <device>1</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -976,7 +977,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>2</device> <device>2</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>3</device> <device>3</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

5
Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
View file

@ -203,7 +203,6 @@
</action> </action>
</animation> </animation>
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>NavOuter</object-name> <object-name>NavOuter</object-name>
@ -552,6 +551,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>4</device> <device>4</device>
<notification>ALT_INNER</notification> <notification>ALT_INNER</notification>
<offset>1</offset>
</binding> </binding>
</action> </action>
<shift-action> <shift-action>
@ -559,6 +559,7 @@
<command>FG1000HardKeyPushed</command> <command>FG1000HardKeyPushed</command>
<device>4</device> <device>4</device>
<notification>ALT_OUTER</notification> <notification>ALT_OUTER</notification>
<offset>1</offset>
</binding> </binding>
</shift-action> </shift-action>
<hovered> <hovered>
@ -971,7 +972,7 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FMSInner</object-name> <object-name>FmsInner</object-name>
<action> <action>
<button>0</button> <button>0</button>
<binding> <binding>

6
Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/NavDataInterface.nas
View file

@ -336,9 +336,9 @@ setDirectTo : func(param)
# No flightplan, or waypoint not found, so use the GPS DTO function. # No flightplan, or waypoint not found, so use the GPS DTO function.
# Hokey property-based interface. # Hokey property-based interface.
setprop("/instrumentation/gps/scratch/ident", id); setprop("/instrumentation/gps/scratch/ident", id);
setprop("/instrumentation/gps/scratch/altitude-ft", 0); setprop("/instrumentation/gps/scratch/altitude-ft", alt_ft);
setprop("/instrumentation/gps/scratch/latitude-deg", 0); setprop("/instrumentation/gps/scratch/latitude-deg", getprop("/position/latitude-deg"));
setprop("/instrumentation/gps/scratch/longitude-deg", 0); setprop("/instrumentation/gps/scratch/longitude-deg", getprop("/position/longitude-deg"));
} }
# Switch the GPS to DTO mode. # Switch the GPS to DTO mode.

4
Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/DirectTo/DirectTo.nas
View file

@ -113,13 +113,13 @@ var DirectTo =
}, },
offdisplay : func() { offdisplay : func() {
me.DirectToChart.setVisible(0); if (me.DirectToChart != nil) me.DirectToChart.setVisible(0);
me._group.setVisible(0); me._group.setVisible(0);
me.getElement("Group").setVisible(0); me.getElement("Group").setVisible(0);
me.getController().offdisplay(); me.getController().offdisplay();
}, },
ondisplay : func() { ondisplay : func() {
me.DirectToChart.setVisible(1); if (me.DirectToChart != nil) me.DirectToChart.setVisible(1);
me._group.setVisible(1); me._group.setVisible(1);
me.getElement("Group").setVisible(1); me.getElement("Group").setVisible(1);
me.getController().ondisplay(); me.getController().ondisplay();

15
Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/NearestVOR/NearestVORController.nas
View file

@ -51,7 +51,6 @@ var NearestVORController =
me._crsrToggle = 1; me._crsrToggle = 1;
}, },
# Input Handling # Input Handling
handleCRSR : func() { handleCRSR : func() {
me._crsrToggle = (! me._crsrToggle); me._crsrToggle = (! me._crsrToggle);
@ -81,13 +80,13 @@ var NearestVORController =
}, },
handleFMSOuter : func(value) { handleFMSOuter : func(value) {
if (me._crsrToggle == 1) { if (me._crsrToggle == 1) {
if (me._currentGroup == NearestVORController.UIGROUP.VOR) { if (me._currentGroup == NearestVORController.UIGROUP.VOR) {
# Scroll through whatever is the current list # Scroll through whatever is the current list
me.page.select.incrSmall(value); me.page.select.incrSmall(value);
var id = me.page.select.getValue(); var id = me.page.select.getValue();
var data = me.getNavDataItem(id); var data = me.getNavDataItem(id);
if ((data != nil) and (size(data) >0)) me.page.updateNavDataItem(data[0]); if ((data != nil) and (size(data) >0)) me.page.updateNavDataItem(data[0]);
} }
return emesary.Transmitter.ReceiptStatus_Finished; return emesary.Transmitter.ReceiptStatus_Finished;
} else { } else {
return me.page.mfd.SurroundController.handleFMSOuter(value); return me.page.mfd.SurroundController.handleFMSOuter(value);

2
Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/PFDInstruments/PFDInstrumentsController.nas
View file

@ -54,6 +54,8 @@ var PFDInstrumentsController =
_leg_xtrk_nm : 0, _leg_xtrk_nm : 0,
_leg_valid : 0, _leg_valid : 0,
_navSelected : 1,
_nav1_id : "", _nav1_id : "",
_nav1_freq : 0.0, _nav1_freq : 0.0,
_nav1_radial_deg : 0, _nav1_radial_deg : 0,

14
Nasal/canvas/map/RTE.lcontroller
View file

@ -1,7 +1,7 @@
# See: http://wiki.flightgear.org/MapStructure # See: http://wiki.flightgear.org/MapStructure
# TODO: this layer doesn't make sense to support for AI/MP traffic, because we don't currently have access to flightplan/routing info # TODO: this layer doesn't make sense to support for AI/MP traffic, because we don't currently have access to flightplan/routing info
# that also applies to other layers like WPT or even navaid layers that handle station tuning based on local radio settings # that also applies to other layers like WPT or even navaid layers that handle station tuning based on local radio settings
# #
# Class things: # Class things:
var name = 'RTE'; var name = 'RTE';
var parents = [SymbolLayer.Controller]; var parents = [SymbolLayer.Controller];
@ -26,9 +26,9 @@ var new = func(layer) {
listeners: [], listeners: [],
}; };
layer.searcher._equals = func(l,r) 0; # TODO: create model objects instead? layer.searcher._equals = func(l,r) 0; # TODO: create model objects instead?
append(m.listeners, setlistener(layer.options.active_node, func m.layer.update() ), append(m.listeners, setlistener(layer.options.active_node, func m.layer.update() ),
setlistener(layer.options.wp_num, func m.layer.update() )); setlistener(layer.options.wp_num, func m.layer.update() ));
m.addVisibilityListener(); m.addVisibilityListener();
var driver = opt_member(m.layer.options, 'route_driver'); var driver = opt_member(m.layer.options, 'route_driver');
if(driver == nil){ if(driver == nil){
@ -52,20 +52,19 @@ var searchCmd = func {
# FIXME: do we return the current route even if it isn't active? # FIXME: do we return the current route even if it isn't active?
printlog(_MP_dbg_lvl, "Running query: ", name); printlog(_MP_dbg_lvl, "Running query: ", name);
var plans = []; # TODO: multiple flightplans? var plans = []; # TODO: multiple flightplans?
var plans = [];
var driver = me.route_driver; var driver = me.route_driver;
driver.update(); driver.update();
if(!driver.shouldUpdate()) return me.last_result; if(!driver.shouldUpdate()) return me.last_result;
# http://wiki.flightgear.org/Nasal_Flightplan # http://wiki.flightgear.org/Nasal_Flightplan
var planCount = driver.getNumberOfFlightPlans(); var planCount = driver.getNumberOfFlightPlans();
for (var idx = 0; idx < planCount; idx += 1) { for (var idx = 0; idx < planCount; idx += 1) {
#var fp = driver.getFlightPlan(idx); if (driver.getFlightPlan(idx) == nil) return [];
var fpSize = driver.getPlanSize(idx); var fpSize = driver.getPlanSize(idx);
if(fpSize < 2) continue; if(fpSize < 2) continue;
var type = driver.getFlightPlanType(idx); var type = driver.getFlightPlanType(idx);
if(type == nil) type = 'current'; if(type == nil) type = 'current';
if (!getprop(me.layer.options.active_node) and if (!getprop(me.layer.options.active_node) and
type == 'current' and type == 'current' and
!me.layer.options.display_inactive_rte) fpSize = 0; !me.layer.options.display_inactive_rte) fpSize = 0;
var coords = []; var coords = [];
var discontinuity = 0; var discontinuity = 0;
@ -91,4 +90,3 @@ var searchCmd = func {
me.last_result = plans; me.last_result = plans;
return plans; return plans;
}; };