Commit 9bd9a8ca authored by Lorenz Meier's avatar Lorenz Meier

Disable simulated position that slipped in

parent 420fd3ab
...@@ -30,12 +30,11 @@ QGCPositionManager::QGCPositionManager(QGCApplication* app) : ...@@ -30,12 +30,11 @@ QGCPositionManager::QGCPositionManager(QGCApplication* app) :
_defaultSource = QGeoPositionInfoSource::createDefaultSource(this); _defaultSource = QGeoPositionInfoSource::createDefaultSource(this);
_simulatedSource = new SimulatedPosition(); _simulatedSource = new SimulatedPosition();
// if the default source is not availble for whatever reason // Enable this to get a simulated target on desktop
// fall back to a simulated source
if(_defaultSource == nullptr) { // if (_defaultSource == nullptr) {
_defaultSource = _simulatedSource; // _defaultSource = _simulatedSource;
} // }
setPositionSource(QGCPositionSource::GPS); setPositionSource(QGCPositionSource::GPS);
} }
...@@ -61,7 +60,7 @@ int QGCPositionManager::updateInterval() const ...@@ -61,7 +60,7 @@ int QGCPositionManager::updateInterval() const
void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource source) void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource source)
{ {
if(_currentSource != nullptr) { if (_currentSource != nullptr) {
_currentSource->stopUpdates(); _currentSource->stopUpdates();
disconnect(_currentSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdated(QGeoPositionInfo))); disconnect(_currentSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdated(QGeoPositionInfo)));
} }
...@@ -78,11 +77,13 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource ...@@ -78,11 +77,13 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource
break; break;
} }
_updateInterval = _currentSource->minimumUpdateInterval(); if (_currentSource != nullptr) {
_currentSource->setPreferredPositioningMethods(QGeoPositionInfoSource::SatellitePositioningMethods); _updateInterval = _currentSource->minimumUpdateInterval();
_currentSource->setUpdateInterval(_updateInterval); _currentSource->setPreferredPositioningMethods(QGeoPositionInfoSource::SatellitePositioningMethods);
_currentSource->startUpdates(); _currentSource->setUpdateInterval(_updateInterval);
_currentSource->startUpdates();
connect(_currentSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdated(QGeoPositionInfo))); connect(_currentSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdated(QGeoPositionInfo)));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment