Browse Source

Signalling fixes

QGC4.4
Don Gagne 9 years ago
parent
commit
f52b62818d
  1. 5
      src/MissionManager/GeoFenceController.cc
  2. 1
      src/MissionManager/GeoFenceController.h
  3. 2
      src/MissionManager/GeoFenceManager.cc
  4. 1
      src/MissionManager/RallyPointController.cc
  5. 1
      src/MissionManager/RallyPointController.h
  6. 2
      src/MissionManager/RallyPointManager.cc

5
src/MissionManager/GeoFenceController.cc

@ -333,9 +333,9 @@ void GeoFenceController::loadFromVehicle(void) @@ -333,9 +333,9 @@ void GeoFenceController::loadFromVehicle(void)
void GeoFenceController::sendToVehicle(void)
{
if (_activeVehicle->parameterManager()->parametersReady() && !syncInProgress()) {
setDirty(false);
_polygon.setDirty(false);
_activeVehicle->geoFenceManager()->sendToVehicle(_breachReturnPoint, _polygon.coordinateList());
_polygon.setDirty(false);
setDirty(false);
} else {
qCWarning(GeoFenceControllerLog) << "GeoFenceController::loadFromVehicle call at wrong time" << _activeVehicle->parameterManager()->parametersReady() << syncInProgress();
}
@ -433,6 +433,7 @@ void GeoFenceController::_loadComplete(const QGeoCoordinate& breachReturn, const @@ -433,6 +433,7 @@ void GeoFenceController::_loadComplete(const QGeoCoordinate& breachReturn, const
_setReturnPointFromManager(breachReturn);
_setPolygonFromManager(polygon);
setDirty(false);
emit loadComplete();
}
QString GeoFenceController::fileExtension(void) const

1
src/MissionManager/GeoFenceController.h

@ -78,6 +78,7 @@ signals: @@ -78,6 +78,7 @@ signals:
void paramsChanged (QVariantList params);
void paramLabelsChanged (QStringList paramLabels);
void editorQmlChanged (QString editorQml);
void loadComplete (void);
private slots:
void _polygonDirtyChanged(bool dirty);

2
src/MissionManager/GeoFenceManager.cc

@ -34,7 +34,7 @@ void GeoFenceManager::_sendError(ErrorCode_t errorCode, const QString& errorMsg) @@ -34,7 +34,7 @@ void GeoFenceManager::_sendError(ErrorCode_t errorCode, const QString& errorMsg)
void GeoFenceManager::loadFromVehicle(void)
{
// No geofence support in unknown vehicle
loadComplete(QGeoCoordinate(), QList<QGeoCoordinate>());
emit loadComplete(QGeoCoordinate(), QList<QGeoCoordinate>());
}
void GeoFenceManager::sendToVehicle(const QGeoCoordinate& breachReturn, const QList<QGeoCoordinate>& polygon)

1
src/MissionManager/RallyPointController.cc

@ -254,6 +254,7 @@ void RallyPointController::_loadComplete(const QList<QGeoCoordinate> rgPoints) @@ -254,6 +254,7 @@ void RallyPointController::_loadComplete(const QList<QGeoCoordinate> rgPoints)
_points.swapObjectList(pointList);
setDirty(false);
_setFirstPointCurrent();
emit loadComplete();
}
QString RallyPointController::fileExtension(void) const

1
src/MissionManager/RallyPointController.h

@ -61,6 +61,7 @@ public: @@ -61,6 +61,7 @@ public:
signals:
void rallyPointsSupportedChanged(bool rallyPointsSupported);
void currentRallyPointChanged(QObject* rallyPoint);
void loadComplete(void);
private slots:
void _loadComplete(const QList<QGeoCoordinate> rgPoints);

2
src/MissionManager/RallyPointManager.cc

@ -34,7 +34,7 @@ void RallyPointManager::_sendError(ErrorCode_t errorCode, const QString& errorMs @@ -34,7 +34,7 @@ void RallyPointManager::_sendError(ErrorCode_t errorCode, const QString& errorMs
void RallyPointManager::loadFromVehicle(void)
{
// No support in generic vehicle
loadComplete(QList<QGeoCoordinate>());
emit loadComplete(QList<QGeoCoordinate>());
}
void RallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints)

Loading…
Cancel
Save