diff options
author | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 11:30:15 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 13:16:26 -0400 |
commit | d7d65ef59bd9e54787fdebebe39ea0d8e1155769 (patch) | |
tree | 26fc3bba8202707beddd2034ebaaecf8c6dd3b09 /app/file_operation.h | |
parent | 1d3670c387c43f355f7190274085c55098fac90f (diff) |
Fixes and rework to allow using with cluster demo
Changes include:
- Remove older libhomescreen and qlibwindowmanager detection and
configuration from qmake configuration in favor of PKGCONFIG
usage.
- Rework main.cpp to look more like ondemandnavi, and use
qlibhomescreen instead of libhomescreen.
- Update file_operation.{h,cpp} with the newer versions from
ondemandnavi that include OSM configuration.
- Fixed typo in arrived signal name in org.agl.naviapi.xml and
dbus_client.cpp.
- Change some qDebug messages in dbus_client.cpp to qWarning as it
seems more appropriate.
- Rework QtLocation plugin configuration in MapWindow.qml to
support OSM and replace mapboxgl with mapbox, as mapboxgl does not
seem to work out of the box.
- Tweak various things in MapWindow.qml to try to better match the
look of ondemandnavi.
- Many commenting and whitespace fixes in MapWindow.qml.
- Update widget config.xml to add now required display permission,
and add the hidden permission so the application will not show up
in the launcher.
- Add license files for the various header files in include/mapbox,
and update README.md to indicate where they come from and what
files the different licenses apply to.
Bug-AGL: SPEC-2913
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I192efd45ab94ace8234dbe6c8983257a24e51d23
Diffstat (limited to 'app/file_operation.h')
-rw-r--r-- | app/file_operation.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/file_operation.h b/app/file_operation.h index 65df54a..962c506 100644 --- a/app/file_operation.h +++ b/app/file_operation.h @@ -7,7 +7,9 @@ #include <QJsonDocument> /****************************************************** - * Write navigation config in /etc/naviconfig.ini + * Please set mapAccessToken, mapStyleUrl, speed, + * interval, latitude and longitude in JSON format + * in /etc/naviconfig.ini ******************************************************/ #define NAVI_CONFIG_FILEPATH "/etc/naviconfig.ini" @@ -16,22 +18,24 @@ class File_Operation: public QObject{ Q_OBJECT QString m_mapAccessToken; - QString m_mapStyle; double m_car_speed; // set Km/h int m_update_interval; // set millisecond double m_start_latitude; double m_start_longitute; + bool m_enable_osm; + QString m_mapStyleUrls; public: File_Operation(); ~File_Operation(); Q_INVOKABLE QString getMapAccessToken(); - Q_INVOKABLE QString getMapStyle(); Q_INVOKABLE double getCarSpeed(); Q_INVOKABLE int getUpdateInterval(); Q_INVOKABLE double getStartLatitude(); Q_INVOKABLE double getStartLongitute(); + Q_INVOKABLE QString getMapStyleUrls(); + Q_INVOKABLE bool isOSMEnabled() { return m_enable_osm; }; private: void initFileOperation(); |