fly/fgdata
1
0
Fork 0
Code Activity

GPS: updated generic GPS dialog, with OBS course selection dial.

Browse source
This commit is contained in:
jmt 2010-03-25 16:42:37 +00:00
parent d8f6ccf49b
commit 26607856c6
1 changed files with 535 additions and 572 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
gui/dialogs/gps.xml
View file

@ -1,11 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<PropertyList> <PropertyList>
<width>620</width> <width>620</width>
<height>430</height> <height>430</height>
<modal>false</modal> <modal>false</modal>
<nasal> <nasal>
<open> <open>
var gps = props.globals.getNode("/instrumentation/gps/", 1); var gps = props.globals.getNode("/instrumentation/gps/", 1);
@ -25,18 +22,15 @@
var slaved = props.globals.getNode("/instrumentation/nav[0]/slaved-to-gps", 1); var slaved = props.globals.getNode("/instrumentation/nav[0]/slaved-to-gps", 1);
</open> </open>
</nasal> </nasal>
<name>gps</name> <name>gps</name>
<layout>vbox</layout> <layout>vbox</layout>
<text>
<text><label>GPS</label></text> <label>GPS</label>
</text>
<hrule/> <hrule/>
<!-- show current state --> <!-- show current state -->
<group> <group>
<layout>table</layout> <layout>table</layout>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
@ -45,7 +39,6 @@
<property>/instrumentation/gps/mode</property> <property>/instrumentation/gps/mode</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -53,7 +46,6 @@
<value>leg</value> <value>leg</value>
</equals> </equals>
</visible> </visible>
<row>0</row> <row>0</row>
<col>1</col> <col>1</col>
<label>MMM</label> <label>MMM</label>
@ -61,23 +53,22 @@
<property>/autopilot/route-manager/current-wp</property> <property>/autopilot/route-manager/current-wp</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<not>
<equals> <equals>
<property>/instrumentation/gps/mode</property> <property>/instrumentation/gps/mode</property>
<value>obs</value> <value>leg</value>
</equals> </equals>
</not>
</visible> </visible>
<row>0</row> <row>0</row>
<col>1</col> <col>1</col>
<label>MMM</label> <label>MMM</label>
<format>Selected Course: %5.1f*</format> <format>Desired Course: %5.1f*</format>
<property>/instrumentation/gps/selected-course-deg</property> <property>/instrumentation/gps/desired-course-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>0</row> <row>0</row>
<col>2</col> <col>2</col>
@ -86,7 +77,6 @@
<property>/instrumentation/gps/wp/wp[1]/course-error-nm</property> <property>/instrumentation/gps/wp/wp[1]/course-error-nm</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
@ -111,7 +101,6 @@
<property>/instrumentation/gps/indicated-altitude-ft</property> <property>/instrumentation/gps/indicated-altitude-ft</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
@ -136,7 +125,6 @@
<property>/instrumentation/gps/indicated-vertical-speed</property> <property>/instrumentation/gps/indicated-vertical-speed</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
@ -145,7 +133,6 @@
<property>/instrumentation/gps/odometer</property> <property>/instrumentation/gps/odometer</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>3</row> <row>3</row>
<col>1</col> <col>1</col>
@ -154,7 +141,6 @@
<property>/instrumentation/gps/raim</property> <property>/instrumentation/gps/raim</property>
<live>true</live> <live>true</live>
</text> </text>
<!-- mode dependent properties --> <!-- mode dependent properties -->
<text> <text>
<row>4</row> <row>4</row>
@ -164,7 +150,6 @@
<property>/instrumentation/gps/wp/wp[1]/ID</property> <property>/instrumentation/gps/wp/wp[1]/ID</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>4</row> <row>4</row>
<col>1</col> <col>1</col>
@ -174,7 +159,6 @@
<property>/instrumentation/gps/wp/wp[1]/name</property> <property>/instrumentation/gps/wp/wp[1]/name</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
@ -199,7 +183,6 @@
<property>/instrumentation/gps/wp/wp[1]/altitude-ft</property> <property>/instrumentation/gps/wp/wp[1]/altitude-ft</property>
<live>true</live> <live>true</live>
</text> </text>
<!-- distance / bearing info --> <!-- distance / bearing info -->
<text> <text>
<row>6</row> <row>6</row>
@ -225,7 +208,6 @@
<property>/instrumentation/gps/wp/wp[1]/TTW</property> <property>/instrumentation/gps/wp/wp[1]/TTW</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -233,7 +215,6 @@
<value>leg</value> <value>leg</value>
</equals> </equals>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>0</col>
<label>MMMMMM</label> <label>MMMMMM</label>
@ -241,7 +222,6 @@
<property>/instrumentation/gps/wp/leg-mag-course-deg</property> <property>/instrumentation/gps/wp/leg-mag-course-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -249,7 +229,6 @@
<value>leg</value> <value>leg</value>
</equals> </equals>
</visible> </visible>
<row>7</row> <row>7</row>
<col>1</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
@ -257,7 +236,6 @@
<property>/instrumentation/gps/wp/leg-distance-nm</property> <property>/instrumentation/gps/wp/leg-distance-nm</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -266,12 +244,10 @@
</equals> </equals>
<property>/instrumentation/gps/to-flag</property> <property>/instrumentation/gps/to-flag</property>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>0</col>
<label>TO</label> <label>TO</label>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -280,26 +256,20 @@
</equals> </equals>
<property>/instrumentation/gps/from-flag</property> <property>/instrumentation/gps/from-flag</property>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>0</col>
<label>FROM</label> <label>FROM</label>
</text> </text>
</group> </group>
<hrule/> <hrule/>
<!-- ident text field, type combo, next/prev paging buttons <!-- ident text field, type combo, next/prev paging buttons
nearest and search buttons nearest and search buttons
--> -->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
@ -322,8 +292,6 @@
</binding> </binding>
</combo> </combo>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
@ -343,7 +311,6 @@
</binding> </binding>
</input> </input>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
@ -357,7 +324,6 @@
</script> </script>
</binding> </binding>
</button> </button>
<button> <button>
<legend>Search Names</legend> <legend>Search Names</legend>
<binding> <binding>
@ -368,7 +334,6 @@
</script> </script>
</binding> </binding>
</button> </button>
<button> <button>
<legend>Nrst</legend> <legend>Nrst</legend>
<binding> <binding>
@ -385,12 +350,10 @@
</script> </script>
</binding> </binding>
</button> </button>
<button> <button>
<enable> <enable>
<property>/autopilot/route-manager/active</property> <property>/autopilot/route-manager/active</property>
</enable> </enable>
<legend>Actv RTE WPT</legend> <legend>Actv RTE WPT</legend>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -400,25 +363,17 @@
</script> </script>
</binding> </binding>
</button> </button>
<empty>
<empty><stretch>true</stretch></empty> <stretch>true</stretch>
</empty>
</group> </group>
</group> </group>
<vrule/> <vrule/>
<group> <group>
<visible> <visible>
<property>/instrumentation/gps/scratch/valid</property> <property>/instrumentation/gps/scratch/valid</property>
</visible> </visible>
<layout>table</layout> <layout>table</layout>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
@ -427,7 +382,6 @@
<property>/instrumentation/gps/scratch/ident</property> <property>/instrumentation/gps/scratch/ident</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>0</row> <row>0</row>
<col>1</col> <col>1</col>
@ -437,7 +391,6 @@
<property>/instrumentation/gps/scratch/name</property> <property>/instrumentation/gps/scratch/name</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
@ -462,7 +415,6 @@
<property>/instrumentation/gps/scratch/altitude-ft</property> <property>/instrumentation/gps/scratch/altitude-ft</property>
<live>true</live> <live>true</live>
</text> </text>
<!-- distance / bearing info --> <!-- distance / bearing info -->
<text> <text>
<row>2</row> <row>2</row>
@ -480,7 +432,6 @@
<property>/instrumentation/gps/scratch/distance-nm</property> <property>/instrumentation/gps/scratch/distance-nm</property>
<live>true</live> <live>true</live>
</text> </text>
<!-- navaid info --> <!-- navaid info -->
<text> <text>
<visible> <visible>
@ -489,7 +440,6 @@
<value>vor</value> <value>vor</value>
</equals> </equals>
</visible> </visible>
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
<label>MMMMMM</label> <label>MMMMMM</label>
@ -497,7 +447,6 @@
<property>/instrumentation/gps/scratch/frequency-mhz</property> <property>/instrumentation/gps/scratch/frequency-mhz</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<visible> <visible>
<equals> <equals>
@ -505,7 +454,6 @@
<value>ndb</value> <value>ndb</value>
</equals> </equals>
</visible> </visible>
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
<label>MMMMMM</label> <label>MMMMMM</label>
@ -513,8 +461,6 @@
<property>/instrumentation/gps/scratch/frequency-khz</property> <property>/instrumentation/gps/scratch/frequency-khz</property>
<live>true</live> <live>true</live>
</text> </text>
<!-- prev/next buttons --> <!-- prev/next buttons -->
<button> <button>
<enable> <enable>
@ -523,7 +469,6 @@
<value>0</value> <value>0</value>
</greater-than> </greater-than>
</enable> </enable>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
<legend>Prev</legend> <legend>Prev</legend>
@ -537,7 +482,6 @@
<enable> <enable>
<property>/instrumentation/gps/scratch/has-next</property> <property>/instrumentation/gps/scratch/has-next</property>
</enable> </enable>
<row>5</row> <row>5</row>
<col>1</col> <col>1</col>
<legend>Next</legend> <legend>Next</legend>
@ -547,19 +491,13 @@
<script>cmd.setValue("next")</script> <script>cmd.setValue("next")</script>
</binding> </binding>
</button> </button>
</group> </group>
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>fill</halign> <halign>fill</halign>
<default-padding>6</default-padding> <default-padding>6</default-padding>
<button> <button>
<legend>LEG</legend> <legend>LEG</legend>
<equal>true</equal> <equal>true</equal>
@ -568,15 +506,6 @@
<script>cmd.setValue("leg")</script> <script>cmd.setValue("leg")</script>
</binding> </binding>
</button> </button>
<button>
<legend>OBS</legend>
<binding>
<command>nasal</command>
<script>cmd.setValue("obs")</script>
</binding>
</button>
<button> <button>
<legend>DTO</legend> <legend>DTO</legend>
<binding> <binding>
@ -584,18 +513,55 @@
<script>cmd.setValue("direct")</script> <script>cmd.setValue("direct")</script>
</binding> </binding>
</button> </button>
<button>
<legend>OBS</legend>
<binding>
<command>nasal</command>
<script>cmd.setValue("obs")</script>
</binding>
</button>
<text>
<visible>
<equals>
<property>/instrumentation/gps/mode</property>
<value>obs</value>
</equals>
</visible>
<pref-width>100</pref-width>
<label>MMM</label>
<format>Selected Course: %03d*</format>
<property>/instrumentation/gps/selected-course-deg</property>
<live>true</live>
</text>
<dial>
<visible>
<equals>
<property>/instrumentation/gps/mode</property>
<value>obs</value>
</equals>
</visible>
<pref-width>30</pref-width>
<pref-height>30</pref-height>
<wrap>true</wrap>
<min>0</min>
<max>359</max>
<stretch>true</stretch>
<property>/instrumentation/gps/selected-course-deg</property>
<binding>
<command>dialog-apply</command>
</binding>
</dial>
<empty>
<stretch>true</stretch>
</empty>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>NAV Slave</label> <label>NAV1 Slave</label>
<property>/instrumentation/nav[0]/slaved-to-gps</property> <property>/instrumentation/nav[0]/slaved-to-gps</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<empty><stretch>true</stretch></empty>
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<default>true</default> <default>true</default>
@ -605,7 +571,4 @@
</binding> </binding>
</button> </button>
</group> </group>
</PropertyList> </PropertyList>