Commit f52b6281 authored by Don Gagne's avatar Don Gagne

Signalling fixes

parent 1b382490
......@@ -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
_setReturnPointFromManager(breachReturn);
_setPolygonFromManager(polygon);
setDirty(false);
emit loadComplete();
}
QString GeoFenceController::fileExtension(void) const
......
......@@ -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);
......
......@@ -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)
......
......@@ -254,6 +254,7 @@ void RallyPointController::_loadComplete(const QList<QGeoCoordinate> rgPoints)
_points.swapObjectList(pointList);
setDirty(false);
_setFirstPointCurrent();
emit loadComplete();
}
QString RallyPointController::fileExtension(void) const
......
......@@ -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);
......
......@@ -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)
......
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