mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

maplocationmodel: store the coordinate as QGeoCoordinate

Browse source 
Instead of maintaining a seperate latitude/longitude values
in C++ and passing them to QML separatelly, pass them as a QGeoCoordinate.

This reduces the number of model "roles" and also prevents the creations
of extra objects in QML (e.g. via QtPositioning.coordinate(..)).

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-17 22:36:55 +03:00 • committed by Dirk Hohndel
parent d783984443
commit f44645b6fe
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qml/MapWidget.qml
View file

@ -37,7 +37,7 @@ Item {
delegate: MapQuickItem {
anchorPoint.x: 0
anchorPoint.y: mapItemImage.height
coordinate: QtPositioning.coordinate(latitude, longitude)
coordinate: model.coordinate
sourceItem: Image { id: mapItemImage; source: "qrc:///mapwidget-marker-image" }
}
}

13
qt-models/maplocationmodel.cpp
View file

@ -5,18 +5,16 @@ MapLocation::MapLocation()
{
}
MapLocation::MapLocation(qreal latitude, qreal longitude) :
m_latitude(latitude), m_longitude(longitude)
MapLocation::MapLocation(QGeoCoordinate coord) :
m_coordinate(coord)
{
}
QVariant MapLocation::getRole(int role) const
{
switch (role) {
case Roles::RoleLatitude:
return m_latitude;
case Roles::RoleLongitude:
return m_longitude;
case Roles::RoleCoordinate:
return QVariant::fromValue(m_coordinate);
default:
return QVariant();
}
@ -24,8 +22,7 @@ QVariant MapLocation::getRole(int role) const
MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent)
{
m_roles[MapLocation::Roles::RoleLatitude] = "latitude";
m_roles[MapLocation::Roles::RoleLongitude] = "longitude";
m_roles[MapLocation::Roles::RoleCoordinate] = "coordinate";
}
MapLocationModel::~MapLocationModel()

12
qt-models/maplocationmodel.h
View file

@ -7,27 +7,25 @@
#include <QHash>
#include <QByteArray>
#include <QAbstractListModel>
#include <QGeoCoordinate>
class MapLocation : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal latitude MEMBER m_latitude)
Q_PROPERTY(qreal longitude MEMBER m_longitude)
Q_PROPERTY(QGeoCoordinate coordinate MEMBER m_coordinate)
public:
explicit MapLocation();
explicit MapLocation(qreal lat, qreal lng);
explicit MapLocation(QGeoCoordinate);
QVariant getRole(int role) const;
enum Roles {
RoleLatitude = Qt::UserRole + 1,
RoleLongitude
RoleCoordinate = Qt::UserRole + 1,
};
private:
qreal m_latitude;
qreal m_longitude;
QGeoCoordinate m_coordinate;
};
class MapLocationModel : public QAbstractListModel