mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
746874a78e
This patch allows updating the location of map markers while editing a dive site and updating the text in the LocationInformationWidget in real-time. Currently it is only possible to see the marker changes by clicking 'Apply'. The modification required the following changes: - add the MapWidget::updateCurrentDiveSiteCoordinatesToMap() slot and call it each time the GPS text updates - separate the updateCurrentDiveSiteCoordinates(FromMap/ToMap) logic by having the FromMap/ToMap suffix to method names - make MapWidgetHelper::updateCurrentDiveSiteCoordinatesToMap() call a new MapLocationModel::updateMapLocationCoordinates() method, which updates selected location coordinates and the model - add MapLocation::setCoordinateNoEmit() that does not emit a signal when updating a coordinate Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
84 lines
2.1 KiB
C++
84 lines
2.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef MAPLOCATIONMODEL_H
|
|
#define MAPLOCATIONMODEL_H
|
|
|
|
#include <QObject>
|
|
#include <QVector>
|
|
#include <QHash>
|
|
#include <QByteArray>
|
|
#include <QAbstractListModel>
|
|
#include <QGeoCoordinate>
|
|
|
|
class MapLocation : public QObject
|
|
{
|
|
Q_OBJECT
|
|
Q_PROPERTY(quint32 uuid READ uuid)
|
|
Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
|
|
Q_PROPERTY(QString name MEMBER m_name)
|
|
|
|
public:
|
|
static const char *PROPERTY_NAME_COORDINATE;
|
|
static const char *PROPERTY_NAME_UUID;
|
|
static const char *PROPERTY_NAME_NAME;
|
|
|
|
explicit MapLocation();
|
|
explicit MapLocation(quint32 uuid, QGeoCoordinate coord, QString name);
|
|
|
|
QVariant getRole(int role) const;
|
|
QGeoCoordinate coordinate();
|
|
void setCoordinate(QGeoCoordinate coord);
|
|
void setCoordinateNoEmit(QGeoCoordinate coord);
|
|
quint32 uuid();
|
|
|
|
enum Roles {
|
|
RoleUuid = Qt::UserRole + 1,
|
|
RoleCoordinate,
|
|
RoleName
|
|
};
|
|
|
|
private:
|
|
quint32 m_uuid;
|
|
QGeoCoordinate m_coordinate;
|
|
QString m_name;
|
|
|
|
signals:
|
|
void coordinateChanged();
|
|
};
|
|
|
|
class MapLocationModel : public QAbstractListModel
|
|
{
|
|
Q_OBJECT
|
|
Q_PROPERTY(int count READ count NOTIFY countChanged)
|
|
Q_PROPERTY(quint32 selectedUuid READ selectedUuid NOTIFY selectedUuidChanged)
|
|
|
|
public:
|
|
MapLocationModel(QObject *parent = NULL);
|
|
~MapLocationModel();
|
|
|
|
Q_INVOKABLE MapLocation *get(int row);
|
|
QVariant data(const QModelIndex &index, int role) const override;
|
|
int rowCount(const QModelIndex &parent) const override;
|
|
int count();
|
|
void add(MapLocation *);
|
|
void addList(QVector<MapLocation *>);
|
|
void clear();
|
|
MapLocation *getMapLocationForUuid(quint32 uuid);
|
|
void updateMapLocationCoordinates(quint32 uuid, QGeoCoordinate coord);
|
|
Q_INVOKABLE void setSelectedUuid(QVariant uuid, QVariant fromClick = true);
|
|
quint32 selectedUuid();
|
|
|
|
protected:
|
|
QHash<int, QByteArray> roleNames() const override;
|
|
|
|
private:
|
|
QVector<MapLocation *> m_mapLocations;
|
|
QHash<int, QByteArray> m_roles;
|
|
quint32 m_selectedUuid;
|
|
|
|
signals:
|
|
void countChanged(int c);
|
|
void selectedUuidChanged();
|
|
void selectedLocationChanged(MapLocation *);
|
|
};
|
|
|
|
#endif
|