fly/fgdata
1
0
Fork 0
Code Activity

Revert "Route-manager: UI for cruise and alternate"

Browse source 
This reverts commit 4320f8403a.
This commit is contained in:
James Turner 2018-11-05 12:56:39 +01:00
parent 575a01aa9a
commit 726b770db6
1 changed files with 18 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
gui/dialogs/route-manager.xml
View file

@ -33,11 +33,6 @@ command interface /autopilot/route-manager/input:
var dep = routem.getNode("departure", 1); var dep = routem.getNode("departure", 1);
var dest = routem.getNode("destination", 1); var dest = routem.getNode("destination", 1);
var isMach = dlg.getNode("cruise-is-mach", 1);
isMach.setBoolValue(routem.getNode('cruise/mach').getValue() > 0.0);
var isFL = dlg.getNode("cruise-is-flight-level", 1);
isFL.setBoolValue(routem.getNode('cruise/flight-level').getValue() > 0);
var sel_index = func { var sel_index = func {
return int(selection.getValue()); return int(selection.getValue());
} }
@ -257,6 +252,8 @@ command interface /autopilot/route-manager/input:
return; return;
} }
# we're on the ground, find the nearest airport to start from # we're on the ground, find the nearest airport to start from
if (fp.departure == nil) { if (fp.departure == nil) {
var apts = findAirportsWithinRange(25.0); var apts = findAirportsWithinRange(25.0);
@ -415,11 +412,7 @@ command interface /autopilot/route-manager/input:
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>updateRunways();</script>
updateRunways();
updateSTARs();
updateApproaches();
</script>
</binding> </binding>
</input> </input>
<text> <text>
@ -505,56 +498,36 @@ command interface /autopilot/route-manager/input:
<object-name>star</object-name> <object-name>star</object-name>
</binding> </binding>
</combo> </combo>
</group>
<!--
<group>
<layout>hbox</layout>
<text> <text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Alternate:</label> <label>Alternate:</label>
<pref-width>80</pref-width>
</text> </text>
<input> <input>
<row>2</row> <name>alt-airport</name>
<col>1</col> <halign>fill</halign>
<halign>left</halign> <stretch>true</stretch>
<name>alternate-airport</name> <pref-width>150</pref-width>
<pref-width>70</pref-width>
<property>/autopilot/route-manager/alternate/airport</property> <property>/autopilot/route-manager/alternate/airport</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>alternate-airport</object-name>
</binding>
</input> </input>
<text>
<row>2</row>
<col>2</col>
<format>%s</format>
<property>/autopilot/route-manager/alternate/name</property>
<live>true</live>
<stretch>true</stretch>
<halign>fill</halign>
</text>
</group> </group>
-->
<group> <group>
<layout>table</layout> <layout>hbox</layout>
<text> <text>
<halign>right</halign> <halign>right</halign>
<label>Cruise Speed:</label> <label> Cruise Speed (kts):</label>
<col>0</col>
</text> </text>
<input> <input>
<name>cruise-speed</name> <name>cruise-speed</name>
<live>true</live> <live>true</live>
<label>(kts)</label>
<halign>left</halign> <halign>left</halign>
<pref-width>50</pref-width> <stretch>true</stretch>
<col>1</col> <pref-width>100</pref-width>
<visible>
<not><property>/sim/gui/dialogs/route-manager/cruise-is-mach</property></not>
</visible>
<property>/autopilot/route-manager/cruise/speed-kts</property> <property>/autopilot/route-manager/cruise/speed-kts</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -562,45 +535,13 @@ command interface /autopilot/route-manager/input:
</binding> </binding>
</input> </input>
<input>
<name>cruise-speed-mach</name>
<live>true</live>
<label>(M)</label>
<halign>left</halign>
<pref-width>50</pref-width>
<property>/autopilot/route-manager/cruise/mach</property>
<binding>
<command>dialog-apply</command>
<object-name>cruise-speed-mach</object-name>
</binding>
<visible>
<property>/sim/gui/dialogs/route-manager/cruise-is-mach</property>
</visible>
<col>1</col>
</input>
<checkbox>
<name>cruise-speed-type-check</name>
<halign>left</halign>
<label>use Mach</label>
<property>/sim/gui/dialogs/route-manager/cruise-is-mach</property>
<binding>
<command>dialog-apply</command>
<object-name>cruise-speed-type-check</object-name>
</binding>
<col>2</col>
</checkbox>
<text> <text>
<label>Cruise Altitude:</label> <label>Cruise Altitude (ft/FL):</label>
<halign>right</halign> <halign>right</halign>
<col>3</col>
</text> </text>
<input> <input>
<name>cruise-alt</name> <name>cruise-alt</name>
<live>true</live> <live>true</live>
<label>(ft)</label>
<halign>left</halign> <halign>left</halign>
<stretch>true</stretch> <stretch>true</stretch>
<pref-width>100</pref-width> <pref-width>100</pref-width>
@ -609,42 +550,7 @@ command interface /autopilot/route-manager/input:
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>cruise-alt</object-name> <object-name>cruise-alt</object-name>
</binding> </binding>
<visible>
<not><property>/sim/gui/dialogs/route-manager/cruise-is-flight-level</property></not>
</visible>
<col>4</col>
</input> </input>
<input>
<name>cruise-alt-fl</name>
<live>true</live>
<label>(FL)</label>
<halign>left</halign>
<stretch>true</stretch>
<pref-width>100</pref-width>
<property>/autopilot/route-manager/cruise/flight-level</property>
<binding>
<command>dialog-apply</command>
<object-name>cruise-alt-fl</object-name>
</binding>
<visible>
<property>/sim/gui/dialogs/route-manager/cruise-is-flight-level</property>
</visible>
<col>4</col>
</input>
<checkbox>
<name>cruise-alt-type-check</name>
<halign>left</halign>
<label>use Flight-level</label>
<property>/sim/gui/dialogs/route-manager/cruise-is-flight-level</property>
<binding>
<command>dialog-apply</command>
<object-name>cruise-alt-type-check</object-name>
</binding>
<col>5</col>
</checkbox>
</group> </group>
<hrule/> <hrule/>