mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-20 06:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

mapwidget.qml: use a seprate animation for zooming out

Browse source 
The animation sequence when deselecting a zoomed in map location, should
be:
- zoom out completely
- pan to center

To achieve that a new animation object is created - "mapAnimationZoomOut"
The previous zoom in animation is renamed to "mapAnimationZoomIn".

The map functions centerOnMapLocation() and deselectMapLocation()
now call the helper functions animateMapZoomIn() and animateMapZoomOut().

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-20 01:33:15 +03:00 • committed by Dirk Hohndel
parent 6aa57ce7f7
commit ce309c15a7
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
mobile-widgets/qml/MapWidget.qml
View file

@ -25,7 +25,7 @@ Item {
readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
readonly property var defaultZoomIn: 17.0
readonly property var defaultZoomOut: 2.0
readonly property var defaultZoomOut: 1.0
property var newCenter: defaultCenter
property var newZoom: 1.0
@ -67,30 +67,51 @@ Item {
}
ParallelAnimation {
id: mapAnimation
id: mapAnimationZoomIn
CoordinateAnimation {
target: map; property: "center"; to: map.newCenter; duration: 2000;
}
NumberAnimation {
target: map; property: "zoomLevel"; to: map.newZoom; duration: 3000; easing.type: Easing.InCubic;
target: map; property: "zoomLevel"; to: map.newZoom ; duration: 3000; easing.type: Easing.InCubic;
}
}
function animateMapTo(coord, zoom) {
ParallelAnimation {
id: mapAnimationZoomOut
NumberAnimation {
target: map; property: "zoomLevel"; from: map.zoomLevel; to: map.newZoom; duration: 3000;
}
SequentialAnimation {
PauseAnimation { duration: 2000 }
CoordinateAnimation {
target: map; property: "center"; to: map.newCenter; duration: 2000;
}
}
}
function animateMapZoomIn(coord) {
zoomLevel = defaultZoomOut
newCenter = coord
newZoom = zoom
mapAnimation.restart()
newZoom = map.defaultZoomIn
mapAnimationZoomIn.restart()
mapAnimationZoomOut.stop()
}
function animateMapZoomOut() {
newCenter = map.defaultCenter
newZoom = map.defaultZoomOut
mapAnimationZoomIn.stop()
mapAnimationZoomOut.restart()
}
function centerOnMapLocation(mapLocation) {
zoomLevel = defaultZoomOut
animateMapTo(mapLocation.coordinate, defaultZoomIn)
mapHelper.model.selectedUuid = mapLocation.uuid
animateMapZoomIn(mapLocation.coordinate)
}
function deselectMapLocation() {
mapHelper.model.selectedUuid = 0
animateMapTo(defaultCenter, defaultZoomOut)
animateMapZoomOut()
}
}
}