Differential D2207 Diff 5273 src/lib/marble/AutoNavigation.cpp

Changeset View

Standalone View

View Options

src/lib/marble/AutoNavigation.cpp

Context not available.
19#include "MarbleMath.h" 19​#include "MarbleMath.h"
20#include "ViewportParams.h" 20​#include "ViewportParams.h"
21#include "MarbleGlobal.h" 21​#include "MarbleGlobal.h"
22​#include "RoutingManager.h"
23​#include "RoutingModel.h"
24​#include "Route.h"
22 25​
23#include <QWidget> 26​#include <QWidget>
24#include <QRect> 27​#include <QRect>
Context not available.
37 const ViewportParams *const m_viewport; 40​ const ViewportParams *const m_viewport;
38 const PositionTracking *const m_tracking; 41​ const PositionTracking *const m_tracking;
39 AutoNavigation::CenterMode m_recenterMode; 42​ AutoNavigation::CenterMode m_recenterMode;
40 bool m_adjustZoom; 43​ bool m_adjustZoom;
41 QTimer m_lastWidgetInteraction; 44​ QTimer m_lastWidgetInteraction;
42 bool m_selfInteraction; 45​ bool m_selfInteraction;
43 46​
44 /** Constructor */ 47​ /** Constructor */
45 Private( MarbleModel *model, const ViewportParams *viewport, AutoNavigation *parent ); 48​ Private( MarbleModel *model, const ViewportParams *viewport, AutoNavigation *parent );
Context not available.
298void AutoNavigation::Private::centerOn( const GeoDataCoordinates &position ) 301​void AutoNavigation::Private::centerOn( const GeoDataCoordinates &position )
299{ 302​{
300 m_selfInteraction = true; 303​ m_selfInteraction = true;
301 emit m_parent->centerOn( position, false ); 304​ RoutingModel const * routingModel = m_model->routingManager()->routingModel();
305​ if (routingModel->deviatedFromRoute()){
nienhueserUnsubmitted
Done

This should also consider whether guidance mode is enabled.

if (!routingModel->guidanceModeEnabled() || routingModel->deviatedFromRoute()) {
nienhueser: This should also consider whether guidance mode is enabled. if (!routingModel…
306​ emit m_parent->centerOn( position, false );
307​ } else {
308​ GeoDataCoordinates positionOnRoute = routingModel->route().positionOnRoute();
309​ emit m_parent->centerOn( positionOnRoute, false );
310​ }
302 m_selfInteraction = false; 311​ m_selfInteraction = false;
303} 312​}
304 313​
Context not available.