From 5cc2c02dfbace9e1486e60b8ffe58a136321e500 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 17 Jul 2017 00:06:05 +0300 Subject: qmlmapwidgethelper: add the centerOnDiveSite() method MapWidget sould not handle any of the map backend. Instead it should just pass calls to MapWidgetHelper. Do that for centerOnDiveSite(). Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/mapwidget.cpp | 8 +------- mobile-widgets/qmlmapwidgethelper.cpp | 12 ++++++++++++ mobile-widgets/qmlmapwidgethelper.h | 4 ++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 1646b7f51..fd461f4a6 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -23,13 +23,7 @@ MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent) void MapWidget::centerOnDiveSite(struct dive_site *ds) { - if (!dive_site_has_gps_location(ds)) - return; - - qreal longitude = ds->longitude.udeg / 1000000.0; - qreal latitude = ds->latitude.udeg / 1000000.0; - - qDebug() << longitude << latitude; + m_mapHelper->centerOnDiveSite(ds); } void MapWidget::centerOnIndex(const QModelIndex& idx) diff --git a/mobile-widgets/qmlmapwidgethelper.cpp b/mobile-widgets/qmlmapwidgethelper.cpp index 5e3016f89..d308afa40 100644 --- a/mobile-widgets/qmlmapwidgethelper.cpp +++ b/mobile-widgets/qmlmapwidgethelper.cpp @@ -1,6 +1,18 @@ #include #include "qmlmapwidgethelper.h" +#include "core/dive.h" +#include "core/divesite.h" + MapWidgetHelper::MapWidgetHelper(QObject *parent) : QObject(parent) { } + +void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds) +{ + if (!dive_site_has_gps_location(ds)) + return; + + qreal longitude = ds->longitude.udeg / 1000000.0; + qreal latitude = ds->latitude.udeg / 1000000.0; +} diff --git a/mobile-widgets/qmlmapwidgethelper.h b/mobile-widgets/qmlmapwidgethelper.h index f4bc05c7d..64ec2b75b 100644 --- a/mobile-widgets/qmlmapwidgethelper.h +++ b/mobile-widgets/qmlmapwidgethelper.h @@ -3,6 +3,8 @@ #include +struct dive_site; + class MapWidgetHelper : public QObject { Q_OBJECT @@ -11,6 +13,8 @@ class MapWidgetHelper : public QObject { public: explicit MapWidgetHelper(QObject *parent = NULL); + void centerOnDiveSite(struct dive_site *); + private: QObject *m_map; }; -- cgit v1.2.3-70-g09d2