CVS: data/gui/dialogs autopilot.xml, 1.22, 1.23
James Turner <[email protected]>
| Newsgroups | gmane.games.flightgear.cvc |
|---|---|
| Message-ID | <[email protected]> |
Update of /var/cvs/FlightGear-0.9/data/gui/dialogs
In directory baron.flightgear.org:/tmp/cvs-serv13228
Modified Files:
autopilot.xml
Log Message:
Update autopilot dialog to use a new flag, to give feedback when the GPS/route-manager is driving the true heading.
Index: autopilot.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/autopilot.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- autopilot.xml 15 Oct 2007 19:01:00 -0000 1.22
+++ autopilot.xml 27 Mar 2010 12:19:52 -0000 1.23
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
<PropertyList>
- <name>autopilot</name>
- <layout>vbox</layout>
-
- <!--
+ <name>autopilot</name>
+ <layout>vbox</layout>
+ <!--
/autopilot/locks/altitude
/autopilot/locks/heading
/autopilot/locks/speed
@@ -17,13 +16,12 @@
/autopilot/settings/true-heading-deg
/autopilot/settings/vertical-speed-fpm
-->
-
- <text><label>Autopilot Settings</label></text>
-
- <hrule/>
-
- <nasal>
- <open>
+ <text>
+ <label>Autopilot Settings</label>
+ </text>
+ <hrule/>
+ <nasal>
+ <open>
## manage one AP property group with checkbox and radio buttons
#
Group = {
@@ -117,371 +115,414 @@
var alt = Group.new("altitude", ["altitude-hold", "vertical-speed-hold", "pitch-hold",
"aoa-hold", "agl-hold", "gs1-hold"]);
</open>
-
- <close>
+ <close>
hdg.del();
vel.del();
alt.del();
</close>
- </nasal>
-
- <group>
- <layout>hbox</layout>
- <default-padding>8</default-padding>
-
- <group> <!-- Heading -->
- <layout>vbox</layout>
- <group>
+ </nasal>
+ <group>
<layout>hbox</layout>
- <checkbox>
- <label>Heading Control</label>
- <halign>fill</halign>
- <property>/sim/gui/dialogs/autopilot/heading-active</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- <binding>
- <command>nasal</command>
- <script>hdg.enable()</script>
- </binding>
- </checkbox>
- </group>
-
- <group>
- <layout>table</layout>
- <text>
- <label>Wings Level</label>
- <halign>right</halign>
- <row>0</row><col>0</col>
- </text>
- <radio>
- <row>0</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/wing-leveler</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>hdg.set("wing-leveler")</script>
- </binding>
- </radio>
-
- <text>
- <label>Heading Bug</label>
- <halign>right</halign>
- <row>1</row><col>0</col>
- </text>
- <radio>
- <row>1</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/dg-heading-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>hdg.set("dg-heading-hold")</script>
- </binding>
- </radio>
- <input>
- <row>1</row><col>2</col>
- <property>/autopilot/settings/heading-bug-deg</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>True Heading</label>
- <halign>right</halign>
- <row>2</row><col>0</col>
- </text>
- <radio>
- <row>2</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/true-heading-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>hdg.set("true-heading-hold")</script>
- </binding>
- </radio>
- <input>
- <row>2</row><col>2</col>
- <property>/autopilot/settings/true-heading-deg</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>NAV1 CDI Course</label>
- <halign>right</halign>
- <row>3</row><col>0</col>
- </text>
- <radio>
- <row>3</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/nav1-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>hdg.set("nav1-hold")</script>
- </binding>
- </radio>
- </group>
-
- <hrule/>
-
- <group>
+ <default-padding>8</default-padding>
+ <group>
+ <!-- Heading -->
+ <layout>vbox</layout>
+ <group>
+ <layout>hbox</layout>
+ <checkbox>
+ <label>Heading Control</label>
+ <halign>fill</halign>
+ <property>/sim/gui/dialogs/autopilot/heading-active</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>hdg.enable()</script>
+ </binding>
+ </checkbox>
+ </group>
+ <group>
+ <layout>table</layout>
+ <text>
+ <label>Wings Level</label>
+ <halign>right</halign>
+ <row>0</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>0</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/wing-leveler</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>hdg.set("wing-leveler")</script>
+ </binding>
+ </radio>
+ <text>
+ <label>Heading Bug</label>
+ <halign>right</halign>
+ <row>1</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>1</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/dg-heading-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>hdg.set("dg-heading-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>1</row>
+ <col>2</col>
+ <property>/autopilot/settings/heading-bug-deg</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>True Heading</label>
+ <halign>right</halign>
+ <row>2</row>
+ <col>0</col>
+ <visible>
+ <not>
+ <property>/autopilot/settings/gps-driving-true-heading</property>
+ </not>
+ </visible>
+ </text>
+ <!-- alternate UI for above, when GPS is controlling -->
+ <text>
+ <visible>
+ <property>/autopilot/settings/gps-driving-true-heading</property>
+ </visible>
+ <label>GPS/FMS Heading</label>
+ <halign>right</halign>
+ <row>2</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>2</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/true-heading-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>hdg.set("true-heading-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <visible>
+ <not>
+ <property>/autopilot/settings/gps-driving-true-heading</property>
+ </not>
+ </visible>
+ <row>2</row>
+ <col>2</col>
+ <property>/autopilot/settings/true-heading-deg</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <!-- alternate UI for above, when GPS is controlling -->
+ <text>
+ <visible>
+ <property>/autopilot/settings/gps-driving-true-heading</property>
+ </visible>
+ <halign>right</halign>
+ <row>2</row>
+ <col>2</col>
+ <label>MMMM</label>
+ <format>%3.0f*</format>
+ <property>/autopilot/settings/true-heading-deg</property>
+ <live>true</live>
+ </text>
+ <text>
+ <label>NAV1 CDI Course</label>
+ <halign>right</halign>
+ <row>3</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>3</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/nav1-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>hdg.set("nav1-hold")</script>
+ </binding>
+ </radio>
+ </group>
+ <hrule/>
+ <group>
+ <layout>hbox</layout>
+ <checkbox>
+ <label>Velocity Control</label>
+ <halign>fill</halign>
+ <property>/sim/gui/dialogs/autopilot/speed-active</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>vel.enable()</script>
+ </binding>
+ </checkbox>
+ </group>
+ <group>
+ <layout>table</layout>
+ <text>
+ <label>Speed with Throttle</label>
+ <halign>right</halign>
+ <row>0</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>0</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/speed-with-throttle</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>vel.set("speed-with-throttle")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>0</row>
+ <col>2</col>
+ <rowspan>2</rowspan>
+ <property>/autopilot/settings/target-speed-kt</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>Speed with Pitch</label>
+ <halign>right</halign>
+ <row>1</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>1</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/speed-with-pitch-trim</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>vel.set("speed-with-pitch-trim")</script>
+ </binding>
+ </radio>
+ </group>
+ </group>
+ <!-- End of Heading/Speed -->
+ <vrule/>
+ <group>
+ <!-- Pitch/Altitude -->
+ <layout>vbox</layout>
+ <group>
+ <layout>hbox</layout>
+ <checkbox>
+ <label>Pitch/Altitude Control</label>
+ <halign>fill</halign>
+ <property>/sim/gui/dialogs/autopilot/altitude-active</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>alt.enable()</script>
+ </binding>
+ </checkbox>
+ </group>
+ <group>
+ <layout>table</layout>
+ <text>
+ <label>Vertical Speed</label>
+ <halign>right</halign>
+ <row>0</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>0</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/vertical-speed-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("vertical-speed-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>0</row>
+ <col>2</col>
+ <property>/autopilot/settings/vertical-speed-fpm</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>Pitch Hold</label>
+ <halign>right</halign>
+ <row>1</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>1</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/pitch-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("pitch-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>1</row>
+ <col>2</col>
+ <property>/autopilot/settings/target-pitch-deg</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>AoA Hold</label>
+ <halign>right</halign>
+ <row>2</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>2</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/aoa-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("aoa-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>2</row>
+ <col>2</col>
+ <property>/autopilot/settings/target-aoa-deg</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>Altitude Hold</label>
+ <halign>right</halign>
+ <row>3</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>3</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/altitude-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("altitude-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>3</row>
+ <col>2</col>
+ <property>/autopilot/settings/target-altitude-ft</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>AGL Hold</label>
+ <halign>right</halign>
+ <row>4</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>4</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/agl-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("agl-hold")</script>
+ </binding>
+ </radio>
+ <input>
+ <row>4</row>
+ <col>2</col>
+ <property>/autopilot/settings/target-agl-ft</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ </input>
+ <text>
+ <label>NAV1 Glideslope</label>
+ <halign>right</halign>
+ <row>5</row>
+ <col>0</col>
+ </text>
+ <radio>
+ <row>5</row>
+ <col>1</col>
+ <property>/sim/gui/dialogs/autopilot/gs1-hold</property>
+ <live>true</live>
+ <binding>
+ <command>nasal</command>
+ <script>alt.set("gs1-hold")</script>
+ </binding>
+ </radio>
+ </group>
+ <empty>
+ <stretch>true</stretch>
+ </empty>
+ </group>
+ <!-- End of Pitch/Altitude VBox -->
+ </group>
+ <hrule/>
+ <group>
+ <!-- Passive Mode Toggle -->
<layout>hbox</layout>
<checkbox>
- <label>Velocity Control</label>
- <halign>fill</halign>
- <property>/sim/gui/dialogs/autopilot/speed-active</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- <binding>
- <command>nasal</command>
- <script>vel.enable()</script>
- </binding>
+ <label>FlightDirector Mode</label>
+ <halign>center</halign>
+ <property>/autopilot/locks/passive-mode</property>
+ <live>true</live>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ </binding>
</checkbox>
- </group>
-
- <group>
- <layout>table</layout>
- <text>
- <label>Speed with Throttle</label>
- <halign>right</halign>
- <row>0</row><col>0</col>
- </text>
- <radio>
- <row>0</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/speed-with-throttle</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>vel.set("speed-with-throttle")</script>
- </binding>
- </radio>
- <input>
- <row>0</row><col>2</col>
- <rowspan>2</rowspan>
- <property>/autopilot/settings/target-speed-kt</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>Speed with Pitch</label>
- <halign>right</halign>
- <row>1</row><col>0</col>
- </text>
- <radio>
- <row>1</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/speed-with-pitch-trim</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>vel.set("speed-with-pitch-trim")</script>
- </binding>
- </radio>
-
- </group>
- </group> <!-- End of Heading/Speed -->
-
-
- <vrule/>
-
-
- <group> <!-- Pitch/Altitude -->
- <layout>vbox</layout>
- <group>
- <layout>hbox</layout>
- <checkbox>
- <label>Pitch/Altitude Control</label>
- <halign>fill</halign>
- <property>/sim/gui/dialogs/autopilot/altitude-active</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- <binding>
- <command>nasal</command>
- <script>alt.enable()</script>
- </binding>
- </checkbox>
- </group>
-
- <group>
- <layout>table</layout>
- <text>
- <label>Vertical Speed</label>
- <halign>right</halign>
- <row>0</row><col>0</col>
- </text>
- <radio>
- <row>0</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/vertical-speed-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("vertical-speed-hold")</script>
- </binding>
- </radio>
- <input>
- <row>0</row><col>2</col>
- <property>/autopilot/settings/vertical-speed-fpm</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>Pitch Hold</label>
- <halign>right</halign>
- <row>1</row><col>0</col>
- </text>
- <radio>
- <row>1</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/pitch-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("pitch-hold")</script>
- </binding>
- </radio>
- <input>
- <row>1</row><col>2</col>
- <property>/autopilot/settings/target-pitch-deg</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>AoA Hold</label>
- <halign>right</halign>
- <row>2</row><col>0</col>
- </text>
- <radio>
- <row>2</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/aoa-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("aoa-hold")</script>
- </binding>
- </radio>
- <input>
- <row>2</row><col>2</col>
- <property>/autopilot/settings/target-aoa-deg</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>Altitude Hold</label>
- <halign>right</halign>
- <row>3</row><col>0</col>
- </text>
- <radio>
- <row>3</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/altitude-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("altitude-hold")</script>
- </binding>
- </radio>
- <input>
- <row>3</row><col>2</col>
- <property>/autopilot/settings/target-altitude-ft</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>AGL Hold</label>
- <halign>right</halign>
- <row>4</row><col>0</col>
- </text>
- <radio>
- <row>4</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/agl-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("agl-hold")</script>
- </binding>
- </radio>
- <input>
- <row>4</row><col>2</col>
- <property>/autopilot/settings/target-agl-ft</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- </input>
-
- <text>
- <label>NAV1 Glideslope</label>
- <halign>right</halign>
- <row>5</row><col>0</col>
- </text>
- <radio>
- <row>5</row><col>1</col>
- <property>/sim/gui/dialogs/autopilot/gs1-hold</property>
- <live>true</live>
- <binding>
- <command>nasal</command>
- <script>alt.set("gs1-hold")</script>
- </binding>
- </radio>
- </group>
-
- <empty><stretch>true</stretch></empty>
-
- </group> <!-- End of Pitch/Altitude VBox -->
- </group>
-
- <hrule/>
-
- <group> <!-- Passive Mode Toggle -->
- <layout>hbox</layout>
- <checkbox>
- <label>FlightDirector Mode</label>
- <halign>center</halign>
- <property>/autopilot/locks/passive-mode</property>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
- </binding>
- <binding>
- <command>property-toggle</command>
- </binding>
- </checkbox>
- </group>
-
- <hrule/>
-
- <button>
- <legend>Close</legend>
- <default>true</default>
- <key>Esc</key>
- <padding>10</padding>
- <binding>
- <command>dialog-apply</command>
- </binding>
- <binding>
- <command>dialog-close</command>
- </binding>
- </button>
-
+ </group>
+ <hrule/>
+ <button>
+ <legend>Close</legend>
+ <default>true</default>
+ <key>Esc</key>
+ <padding>10</padding>
+ <binding>
+ <command>dialog-apply</command>
+ </binding>
+ <binding>
+ <command>dialog-close</command>
+ </binding>
+ </button>
</PropertyList>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev