fly/fgdata
1
0
Fork 0
Code Activity

Airport dialog: Basic support for drag/zoom with the mouse

Browse source
This commit is contained in:
Thomas Geymayer 2012-12-03 00:36:08 +01:00
parent d722d98164
commit cf27a29da4
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Nasal/canvas/generic-canvas-map.xml
View file

@ -97,6 +97,19 @@ In the close block, you'll want to call "map.cleanup_listeners()" at the moment
.setupZoom( dialog:DIALOG_CANVAS ) # TODO: make zooming configurable for non GUI use
.pickupFeatures (DIALOG_CANVAS); # set up the features specified in the XML file
var offset = [0,0];
my_canvas.addEventListener("drag", func(e)
{
offset[0] += e.deltaX;
offset[1] += e.deltaY;
map.setTranslation(300 + offset[0], 200 + offset[1]);
});
my_canvas.addEventListener("wheel", func(e)
{
map.zoom_property.setIntValue(map.zoom_property.getValue() + e.deltaY );
});
canvas.run_callbacks(); # WORKAROUND to run dialog-specific init code -
# must be set up via register_callback() in the dialog's open block currently
]]>

25
Nasal/canvas/map.nas
View file

@ -373,12 +373,16 @@ var LayeredMap = { ranges:[],
}
LayeredMap.updateZoom = func {
var z = getprop(me.zoom_property) or 0;
var zoom = me.ranges[ size(me.ranges)-1 -z];
var z = me.zoom_property.getValue() or 0;
z = math.max(0, math.min(z, size(me.ranges) - 1));
me.zoom_property.setIntValue(z);
var zoom = me.ranges[size(me.ranges) - 1 - z];
# print("Setting zoom range to:", zoom);
benchmark("Zooming map:"~zoom, func
me._node.getNode("range", 1).setDoubleValue(zoom)
);
benchmark("Zooming map:"~zoom, func
{
me._node.getNode("range", 1).setDoubleValue(zoom);
# TODO update center/limit translation to keep airport always visible
});
me; #chainable
}
@ -398,14 +402,15 @@ LayeredMap.updateState = func {
# TODO: this is currently GUI specific and not re-usable for instruments
LayeredMap.setupZoom = func(dialog) {
var dlgroot = dialog.getNode("features/dialog-root").getValue();#FIXME: GUI specific - needs to be re-implemented for instruments
var zoom_property = dlgroot ~"/"~dialog.getNode("features/range-property").getValue(); #FIXME: this doesn't belong here, need to be in ctor instead !!!
me.zoom_property = props.globals.getNode(dlgroot ~"/"~dialog.getNode("features/range-property").getValue(), 1); #FIXME: this doesn't belong here, need to be in ctor instead !!!
ranges=dialog.getNode("features/ranges").getChildren("range");
foreach(var r; ranges)
append(me.ranges, r.getValue() );
if( size(me.ranges) == 0 )
# TODO check why this gets called everytime the dialog is opened
foreach(var r; ranges)
append(me.ranges, r.getValue() );
# print("Setting up Zoom Ranges:", size(ranges)-1);
me.zoom_property=zoom_property;
me.listen(zoom_property, func me.updateZoom() );
me.listen(me.zoom_property, func me.updateZoom() );
me.updateZoom();
me; #chainable
}