mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Globe: only remember the last zoom if we are not flying

Browse source 
No point in remembering the "current" zoom while we are flying to a new
position. Also make sure you remember things before we start a new flight.

Finally, set the radius to 1000 which is what Marble recommends for a zoom
that shows the whole globe.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-26 20:27:06 -07:00
parent 5fc31f6afc
commit a5e3a6fd5e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/globe.cpp
View file

@ -286,13 +286,15 @@ void GlobeGPS::zoomOutForNoGPS()
// this is called if the dive has no GPS location. // this is called if the dive has no GPS location.
// zoom out quite a bit to show the globe and remember that the next time // zoom out quite a bit to show the globe and remember that the next time
// we show a dive with GPS location we need to zoom in again // we show a dive with GPS location we need to zoom in again
if (fixZoomTimer->isActive())
fixZoomTimer->stop();
setZoom(0, Marble::Automatic);
if (!needResetZoom) { if (!needResetZoom) {
needResetZoom = true; needResetZoom = true;
currentZoomLevel = zoom(); if (!fixZoomTimer->isActive())
currentZoomLevel = zoom();
} }
if (fixZoomTimer->isActive())
fixZoomTimer->stop();
// 1000 is supposed to make sure you see the whole globe
setZoom(1000, Marble::Linear);
} }
void GlobeGPS::endGetDiveCoordinates() void GlobeGPS::endGetDiveCoordinates()