summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-11-12 17:41:48 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-12-05 02:27:55 +0000
commit7dde4db1a2f51532e0b5eafcc427213a50902ded (patch)
treed474beee2b3e23d5c7d8d222934babb84d130387
parent852ec71c8621044f05a01f2bfc1a44661bceedf6 (diff)
tbtnavi: read missing qml signals/slots
Connect libqtappfw provided events to qml via signals/slots Bug-AGL: SPEC-2880 Change-Id: Ib915195caf34ac94575bebd03bdd86fd848c36d6 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit c5313bfa18ab0b0b8997c72473458e741857bc8a)
-rw-r--r--app/main.cpp4
-rw-r--r--app/navigation_client.cpp14
2 files changed, 17 insertions, 1 deletions
diff --git a/app/main.cpp b/app/main.cpp
index eb7f3f3..108ce08 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -88,10 +88,12 @@ int main(int argc, char *argv[])
context->setContextProperty("fileOperation", &file);
Navigation *navigation = new Navigation(bindingAddress, context);
- new navigation_client(navigation);
engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
+
QObject *root = engine.rootObjects().first();
+ new navigation_client(navigation, root->findChild<QObject*>("mapwindow"));
+
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
QObject::connect(window, SIGNAL(frameSwapped()), qwmHandler, SLOT(slotActivateWindow()));
diff --git a/app/navigation_client.cpp b/app/navigation_client.cpp
index f07f6c7..426bbeb 100644
--- a/app/navigation_client.cpp
+++ b/app/navigation_client.cpp
@@ -5,6 +5,20 @@ navigation_client::navigation_client(Navigation *navigation, QObject *parent) :
{
QObject::connect(m_navigation, &Navigation::statusEvent, this, &navigation_client::statusEvent);
QObject::connect(m_navigation, &Navigation::positionEvent, this, &navigation_client::positionEvent);
+
+ // connect the signal to qml inside function(addRoutePointsQml -> do_addRoutePoint)
+ QObject::connect(this, SIGNAL(addRoutePointsQml(QVariant, QVariant, QVariant, QVariant)),
+ parent, SLOT(do_addRoutePoint(QVariant, QVariant, QVariant, QVariant)));
+
+ // connect the signal to qml inside function(positionQml -> do_setCoordinate)
+ QObject::connect(this, SIGNAL(positionQml(QVariant, QVariant,QVariant, QVariant)),
+ parent, SLOT(do_setCoordinate(QVariant, QVariant,QVariant, QVariant)));
+
+ // connect the signal to qml inside function(stopdemoQml -> do_stopnavidemo)
+ QObject::connect(this, SIGNAL(stopdemoQml()), parent, SLOT(do_stopnavidemo()));
+
+ // connect the signal to qml inside function(arrivedestQml -> do_arrivedest)
+ QObject::connect(this, SIGNAL(arrivedestQml()), parent, SLOT(do_arrivedest()));
}
navigation_client::~navigation_client(){}