summaryrefslogtreecommitdiffstats
path: root/app/navigation_client.cpp
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-06-07 15:39:51 -0400
committerScott Murray <scott.murray@konsulko.com>2022-06-07 15:50:29 -0400
commitb53c55799ff50fb51bec1bf75bac477fa4165336 (patch)
tree4200790f43db597c73de3acda9c71b76938a67e2 /app/navigation_client.cpp
parent70dfe121582cda2c82c794e5af6550b5c1a237c4 (diff)
Updates to restore to a functional state
Changes: - Add setenv of QT_QUICK_CONTROLS_STYLE and setting of the frameless window hint to match the previous behavior before the removal of the previous application framework. - Use the new VehicleSignals API from libqtappfw to replace the previous signal-composer usage. - Update the use of the Navigation API from libqtappfw for its rework to use VIS signals instead of the previous signal-composer usage. - The default unit for the vehicle speed has been switched to kilometers with switching driven by the appropriate VSS schema value. Bug-AGL: SPEC-4409, SPEC-4426 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I69b60a1e3207a54c34aaf114a1e89fce2cf0059f
Diffstat (limited to 'app/navigation_client.cpp')
-rw-r--r--app/navigation_client.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/app/navigation_client.cpp b/app/navigation_client.cpp
index 426bbeb..a8682da 100644
--- a/app/navigation_client.cpp
+++ b/app/navigation_client.cpp
@@ -1,10 +1,11 @@
+#include <QDebug>
#include "navigation_client.h"
navigation_client::navigation_client(Navigation *navigation, QObject *parent) :
m_navigation(navigation)
{
- QObject::connect(m_navigation, &Navigation::statusEvent, this, &navigation_client::statusEvent);
- QObject::connect(m_navigation, &Navigation::positionEvent, this, &navigation_client::positionEvent);
+ QObject::connect(m_navigation, &Navigation::statusEvent, this, &navigation_client::onStatusEvent);
+ QObject::connect(m_navigation, &Navigation::positionEvent, this, &navigation_client::onPositionEvent);
// connect the signal to qml inside function(addRoutePointsQml -> do_addRoutePoint)
QObject::connect(this, SIGNAL(addRoutePointsQml(QVariant, QVariant, QVariant, QVariant)),
@@ -23,21 +24,21 @@ navigation_client::navigation_client(Navigation *navigation, QObject *parent) :
navigation_client::~navigation_client(){}
-void navigation_client::statusEvent(QVariantMap data)
+void navigation_client::onStatusEvent(QVariantMap data)
{
if (!data.contains("state"))
return;
QString state = data["state"].toString();
- if (state == "arrived")
+ if (state == "Arrived")
emit arrivedestQml();
- if (state == "stopped" || state == "stop")
+ if (state == "Stopped")
emit stopdemoQml();
}
-void navigation_client::positionEvent(QVariantMap data)
+void navigation_client::onPositionEvent(QVariantMap data)
{
if (!data.contains("position"))
return;;