Browse Source

emit loadComplete even when fence/rally not supported

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
d9f955e282
  1. 1
      src/FirmwarePlugin/APM/APMGeoFenceManager.cc
  2. 7
      src/FirmwarePlugin/APM/APMRallyPointManager.cc

1
src/FirmwarePlugin/APM/APMGeoFenceManager.cc

@ -103,6 +103,7 @@ void APMGeoFenceManager::loadFromVehicle(void) @@ -103,6 +103,7 @@ void APMGeoFenceManager::loadFromVehicle(void)
_polygon.clear();
if (!_fenceSupported) {
emit loadComplete(_breachReturnPoint, _polygon);
return;
}

7
src/FirmwarePlugin/APM/APMRallyPointManager.cc

@ -53,12 +53,17 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints) @@ -53,12 +53,17 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints)
void APMRallyPointManager::loadFromVehicle(void)
{
if (_vehicle->isOfflineEditingVehicle() || !rallyPointsSupported() || _readTransactionInProgress) {
if (_vehicle->isOfflineEditingVehicle() || _readTransactionInProgress) {
return;
}
_rgPoints.clear();
if (!rallyPointsSupported()) {
emit loadComplete(QList<QGeoCoordinate>());
return;
}
_cReadRallyPoints = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, _rallyTotalParam)->rawValue().toInt();
qCDebug(RallyPointManagerLog) << "APMRallyPointManager::loadFromVehicle - point count" << _cReadRallyPoints;
if (_cReadRallyPoints == 0) {

Loading…
Cancel
Save