f0d44ae8fe
Fix the main bugs, add features and convert most of the layers. Move/refactor some things as well. Add a canvas map dialog next to the built-in one -- it's not 100% functional but it's quite close actually. As before, the excitement has been taking place at our team clone. https://gitorious.org/fg/canvas-hackers-fgdata/commits/0b4cc84 (topics/canvas-map-dialog branch this time, current HEAD in above URL.)
498 lines
18 KiB
XML
498 lines
18 KiB
XML
<?xml version="1.0"?>
|
|
|
|
<PropertyList>
|
|
<name>map-canvas</name>
|
|
<layout>vbox</layout>
|
|
<resizable>true</resizable>
|
|
|
|
<color>
|
|
<red type="float">0.41</red>
|
|
<green type="float">0.4</green>
|
|
<blue type="float">0.42</blue>
|
|
<alpha type="float">1.0</alpha>
|
|
</color>
|
|
|
|
<nasal>
|
|
<open><![CDATA[
|
|
var self = cmdarg();
|
|
var listeners = [];
|
|
var setTransparency = func(updateDialog){
|
|
var alpha = (getprop("/sim/gui/dialogs/map-canvas/transparent") or 0);
|
|
self.getNode("color/alpha").setValue(1-alpha*0.3);
|
|
self.getNode("color/red").setValue(0.41-alpha*0.2);
|
|
self.getNode("color/green").setValue(0.4-alpha*0.2);
|
|
self.getNode("color/blue").setValue(0.42-alpha*0.2);
|
|
var n = props.Node.new({ "dialog-name": "map-canvas" });
|
|
if (updateDialog)
|
|
{
|
|
fgcommand("dialog-close", n);
|
|
fgcommand("dialog-show", n);
|
|
}
|
|
}
|
|
setTransparency(0);
|
|
]]></open>
|
|
|
|
<close><![CDATA[
|
|
TestMap.del();
|
|
foreach (var l; listeners)
|
|
removelistener(l);
|
|
setsize(listeners, 0);
|
|
]]></close>
|
|
</nasal>
|
|
|
|
<group>
|
|
<layout>hbox</layout>
|
|
<empty><stretch>1</stretch></empty>
|
|
|
|
<text>
|
|
<label>Map (Canvas)</label>
|
|
</text>
|
|
|
|
<empty><stretch>1</stretch></empty>
|
|
|
|
<button>
|
|
<pref-width>16</pref-width>
|
|
<pref-height>16</pref-height>
|
|
<legend></legend>
|
|
<keynum>27</keynum>
|
|
<border>2</border>
|
|
|
|
<binding>
|
|
<command>dialog-close</command>
|
|
</binding>
|
|
</button>
|
|
</group>
|
|
<hrule/>
|
|
|
|
<group>
|
|
<layout>hbox</layout>
|
|
<stretch>true</stretch>
|
|
|
|
<!-- sidebar -->
|
|
<group>
|
|
<layout>vbox</layout>
|
|
<text>
|
|
<label>Display:</label>
|
|
</text>
|
|
|
|
<checkbox>
|
|
<label>Airports</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-APT</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>Fixes</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-FIX</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>VORs</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-VOR</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>DMEs</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-DME</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>NDBs</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-NDB</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<!--
|
|
<button>
|
|
<legend>Airways</legend>
|
|
<pref-width>100</pref-width>
|
|
</button>
|
|
-->
|
|
|
|
<checkbox>
|
|
<label>Traffic</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-TFC</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<!--
|
|
<button>
|
|
<legend>Obstacles</legend>
|
|
<pref-width>100</pref-width>
|
|
</button>
|
|
-->
|
|
|
|
<checkbox>
|
|
<label>Data</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-data</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>Flight History</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-FLT</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<!-- layer only supported if LW/AW is active -->
|
|
<enable>
|
|
<property>/sim/gui/dialogs/metar/mode/local-weather</property>
|
|
<value>1</value>
|
|
</enable>
|
|
|
|
<label>Weather</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-WXR</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<!-- layer only supported if tutorial system is active and targets specified-->
|
|
<!--
|
|
<checkbox>
|
|
<enable>
|
|
<property>/sim/gui/dialogs/metar/mode/local-weather</property>
|
|
<value>1</value>
|
|
</enable>
|
|
<label>Tutorial Goals</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/draw-TUT</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
-->
|
|
|
|
<empty><stretch>true</stretch></empty>
|
|
|
|
<checkbox>
|
|
<label>Magnetic Hdgs</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/magnetic-headings</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>Center on Acft</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/centre-on-aircraft</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>Aircraft Hdg Up</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/aircraft-heading-up</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<checkbox>
|
|
<label>Transparent</label>
|
|
<pref-width>100</pref-width>
|
|
<property>/sim/gui/dialogs/map-canvas/transparent</property>
|
|
<live>true</live>
|
|
<binding>
|
|
<command>dialog-apply</command>
|
|
</binding>
|
|
<binding>
|
|
<command>property-toggle</command>
|
|
</binding>
|
|
<binding>
|
|
<command>nasal</command>
|
|
<script>setTransparency(1);</script>
|
|
</binding>
|
|
</checkbox>
|
|
|
|
<empty><stretch>true</stretch></empty>
|
|
|
|
<button>
|
|
<name>close</name>
|
|
<legend>Close</legend>
|
|
<pref-width>100</pref-width>
|
|
<default>true</default>
|
|
<binding>
|
|
<command>dialog-close</command>
|
|
</binding>
|
|
</button>
|
|
|
|
</group>
|
|
|
|
<vrule/>
|
|
|
|
<group>
|
|
<layout>vbox</layout>
|
|
<stretch>true</stretch>
|
|
|
|
<group>
|
|
<canvas>
|
|
<name>canvas-map</name>
|
|
<valign>fill</valign>
|
|
<halign>fill</halign>
|
|
<stretch>true</stretch>
|
|
<pref-width>600</pref-width>
|
|
<pref-height>400</pref-height>
|
|
<nasal><load><![CDATA[
|
|
var myCanvas = canvas.get( cmdarg() );
|
|
myCanvas.setColorBackground(0,0,0,0.5); # transparent
|
|
var TestMap = myCanvas.createGroup().createChild("map");
|
|
|
|
# Initialize the controller:
|
|
var ctrl_ns = canvas.Map.Controller.get("Aircraft position");
|
|
var source = ctrl_ns.SOURCES["map-dialog"];
|
|
if (source == nil) {
|
|
# TODO: amend
|
|
var source = ctrl_ns.SOURCES["map-dialog"] = {
|
|
getPosition: func subvec(geo.aircraft_position().latlon(), 0, 2),
|
|
getAltitude: func getprop('/position/altitude-ft'),
|
|
getHeading: func {
|
|
if (me.aircraft_heading)
|
|
getprop('/orientation/heading-deg')
|
|
else 0
|
|
},
|
|
aircraft_heading: 1,
|
|
};
|
|
}
|
|
setlistener("/sim/gui/dialogs/map-canvas/aircraft-heading-up", func(n) {
|
|
source.aircraft_heading = n.getBoolValue();
|
|
}, 1);
|
|
# Make it move with our aircraft:
|
|
TestMap.setController("Aircraft position", "map-dialog"); # from aircraftpos.controller
|
|
|
|
# Initialize a range:
|
|
TestMap.setRange(20);
|
|
var range_step = math.log10(TestMap.getRange());
|
|
# TODO: check if this is valid, IIRC DOM manipulation was fragile when done inside canvas/Nasal region (?)
|
|
gui.findElementByName(self, "zoomdisplay").setValue("property", TestMap._node.getNode("range").getPath());
|
|
|
|
# Center the map's origin: FIXME: move to api.nas, i.e. allow maps to have a size/view that differs from the actual canvas ??
|
|
TestMap.setTranslation(
|
|
myCanvas.get("view[0]")/2,
|
|
myCanvas.get("view[1]")/2
|
|
);
|
|
|
|
##
|
|
# Styling: This is a bit crude at the moment, i.e. no dedicated APIs yet - but it's
|
|
# just there to prototype things for now
|
|
var Styles = {};
|
|
Styles.get = func(type) return Styles[type];
|
|
var Options = {};
|
|
Options.get = func(type) return Options[type];
|
|
|
|
## set up a few keys supported by the DME.symbol file to customize appearance:
|
|
Styles.DME = {};
|
|
Styles.DME.debug = 1; # HACK for benchmarking/debugging purposes
|
|
Styles.DME.animation_test = 0; # for prototyping animated symbols
|
|
|
|
Styles.DME.scale_factor = 0.4; # 40% (applied to whole group)
|
|
Styles.DME.line_width = 3.0;
|
|
Styles.DME.color_tuned = [0,1,0]; #rgb
|
|
Styles.DME.color_default = [1,1,0]; #rgb
|
|
|
|
Styles.APT = {};
|
|
Styles.APT.scale_factor = 0.4; # 40% (applied to whole group)
|
|
Styles.APT.line_width = 3.0;
|
|
Styles.APT.color_default = [0,0.6,0.85]; #rgb
|
|
Styles.APT.label_font_color = Styles.APT.color_default;
|
|
Styles.APT.label_font_size=28;
|
|
|
|
Styles.TFC = {};
|
|
Styles.TFC.scale_factor = 0.4; # 40% (applied to whole group)
|
|
|
|
Styles.WPT = {};
|
|
Styles.WPT.scale_factor = 0.5; # 50% (applied to whole group)
|
|
|
|
Styles.RTE = {};
|
|
Styles.RTE.line_width = 2;
|
|
|
|
Styles.FLT = {};
|
|
Styles.FLT.line_width = 3;
|
|
|
|
Styles.FIX = {};
|
|
Styles.FIX.color = [1,0,0];
|
|
Styles.FIX.scale_factor = 0.4; # 40%
|
|
|
|
Styles.VOR = {};
|
|
Styles.VOR.range_line_width = 2;
|
|
Styles.VOR.radial_line_width = 1;
|
|
Styles.VOR.scale_factor = 0.6; # 60%
|
|
|
|
Options.FLT = {};
|
|
var make_update_wrapper = func(name) {
|
|
if (!contains(Options, name)) Options[name] = {};
|
|
Options[name].update_wrapper = func(layer, fn) {
|
|
var t = systime();
|
|
fn();
|
|
t = systime() - t;
|
|
printlog(canvas._MP_dbg_lvl, name~" took "~(t*1000)~"ms")
|
|
}
|
|
}
|
|
|
|
var ToggleLayerVisible = func(name) {
|
|
(var l = TestMap.getLayer(name)).setVisible(l.getVisible());
|
|
};
|
|
var SetLayerVisible = func(name,n=1) {
|
|
TestMap.getLayer(name).setVisible(n);
|
|
};
|
|
|
|
Styles.APS = {};
|
|
Styles.APS.scale_factor = 0.25;
|
|
|
|
# TODO: introduce some meta NAV layer that handles both VORs and NDBs, can we instantiate those layers directly ?
|
|
var r = func(name,vis=1,zindex=nil) return caller(0)[0];
|
|
# TODO: we'll need some z-indexing here, right now it's just random
|
|
foreach(var type; [r('TFC',0),r('APT'),r('DME'),r('VOR'),r('NDB'),r('FIX',0),r('RTE'),r('WPT'),r('FLT'),r('WXR',0),r('APS'), ] ) {
|
|
if (1 and type.name != 'APS' and type.name != 'FLT') make_update_wrapper(type.name);
|
|
TestMap.addLayer(factory: canvas.SymbolLayer, type_arg: type.name,
|
|
visible: type.vis, priority: type.zindex,
|
|
style: Styles.get(type.name),
|
|
options: Options.get(type.name) );
|
|
(func {
|
|
# Notify MapStructure about layer visibility changes:
|
|
var name = type.name;
|
|
props.globals.initNode("/sim/gui/dialogs/map-canvas/draw-"~name, type.vis, "BOOL");
|
|
append(listeners,
|
|
setlistener("/sim/gui/dialogs/map-canvas/draw-"~name,
|
|
func(n) SetLayerVisible(name,n.getValue()))
|
|
);
|
|
})();
|
|
}
|
|
]]></load></nasal>
|
|
</canvas>
|
|
<layout>hbox</layout>
|
|
</group>
|
|
|
|
<hrule/>
|
|
<group>
|
|
<layout>hbox</layout>
|
|
|
|
<button>
|
|
<name>zoomout</name>
|
|
<legend>out</legend>
|
|
<pref-width>52</pref-width>
|
|
<pref-height>22</pref-height>
|
|
|
|
<binding>
|
|
<command>nasal</command>
|
|
<script>
|
|
var range = TestMap.getRange();
|
|
if (range < 40)
|
|
TestMap.setRange(range*range_step);
|
|
</script>
|
|
</binding>
|
|
</button>
|
|
|
|
<text>
|
|
<name>zoomdisplay</name>
|
|
<label>MMM</label>
|
|
<format>Zoom %0.1f NM</format>
|
|
<property>/gui/radar-mapstructure/zoom</property>
|
|
<live>true</live>
|
|
</text>
|
|
|
|
<button>
|
|
<name>zoomin</name>
|
|
<legend>in</legend>
|
|
<pref-width>52</pref-width>
|
|
<pref-height>22</pref-height>
|
|
|
|
<binding>
|
|
<command>nasal</command>
|
|
<script>
|
|
var range = TestMap.getRange();
|
|
if (range > 1)
|
|
TestMap.setRange(range/range_step);
|
|
</script>
|
|
</binding>
|
|
</button>
|
|
</group>
|
|
</group>
|
|
</group>
|
|
</PropertyList>
|
|
|