mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
Create GpsListModel in order to be able to display GPS fixes
This will allow us to visualize the GPS fixes that are currently stored in the QML UI. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
0f31102020
commit
a7f8a7574e
5 changed files with 162 additions and 6 deletions
|
@ -226,6 +226,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
|
|||
qt-mobile/qmlmanager.cpp
|
||||
qt-mobile/qmlprofile.cpp
|
||||
qt-models/divelistmodel.cpp
|
||||
qt-models/gpslistmodel.cpp
|
||||
subsurface-mobile-main.cpp
|
||||
subsurface-mobile-helper.cpp
|
||||
)
|
||||
|
|
96
qt-models/gpslistmodel.cpp
Normal file
96
qt-models/gpslistmodel.cpp
Normal file
|
@ -0,0 +1,96 @@
|
|||
#include "gpslistmodel.h"
|
||||
#include "helpers.h"
|
||||
|
||||
GpsTracker::GpsTracker()
|
||||
{
|
||||
m_latitude = 0;
|
||||
m_longitude = 0;
|
||||
m_when = 0;
|
||||
m_name = QString();
|
||||
}
|
||||
|
||||
GpsTracker::~GpsTracker()
|
||||
{
|
||||
}
|
||||
|
||||
uint64_t GpsTracker::when() const
|
||||
{
|
||||
return m_when;
|
||||
}
|
||||
|
||||
int32_t GpsTracker::latitude() const
|
||||
{
|
||||
return m_latitude;
|
||||
}
|
||||
|
||||
int32_t GpsTracker::longitude() const
|
||||
{
|
||||
return m_longitude;
|
||||
}
|
||||
|
||||
QString GpsTracker::name() const
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
|
||||
GpsListModel *GpsListModel::m_instance = NULL;
|
||||
|
||||
GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent)
|
||||
{
|
||||
m_instance = this;
|
||||
}
|
||||
|
||||
void GpsListModel::addGpsFix(gpsTracker *g)
|
||||
{
|
||||
beginInsertColumns(QModelIndex(), rowCount(), rowCount());
|
||||
m_gpsFixes.append(GpsTracker(g));
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
void GpsListModel::clear()
|
||||
{
|
||||
if (m_gpsFixes.count()) {
|
||||
beginRemoveRows(QModelIndex(), 0, m_gpsFixes.count() - 1);
|
||||
m_gpsFixes.clear();
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
|
||||
int GpsListModel::rowCount(const QModelIndex &parent) const
|
||||
{
|
||||
return m_gpsFixes.count();
|
||||
}
|
||||
|
||||
QVariant GpsListModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
if (index.row() < 0 || index.row() > m_gpsFixes.count())
|
||||
return QVariant();
|
||||
|
||||
const GpsTracker > = m_gpsFixes[index.row()];
|
||||
|
||||
if (role == GpsDateRole)
|
||||
return get_short_dive_date_string(gt.when());
|
||||
else if (role == GpsNameRole)
|
||||
return QString(gt.name());
|
||||
else if (role == GpsLatitudeRole)
|
||||
return QString::number(gt.latitude() / 1000000.0, 'f', 6);
|
||||
else if (role == GpsLongitudeRole)
|
||||
return QString::number(gt.longitude() / 1000000.0, 'f', 6);
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
QHash<int, QByteArray> GpsListModel::roleNames() const
|
||||
{
|
||||
QHash<int, QByteArray> roles;
|
||||
roles[GpsDateRole] = "when";
|
||||
roles[GpsNameRole] = "name";
|
||||
roles[GpsLatitudeRole] = "latitude";
|
||||
roles[GpsLongitudeRole] = "longitude";
|
||||
return roles;
|
||||
}
|
||||
|
||||
GpsListModel *GpsListModel::instance()
|
||||
{
|
||||
return m_instance;
|
||||
}
|
||||
|
57
qt-models/gpslistmodel.h
Normal file
57
qt-models/gpslistmodel.h
Normal file
|
@ -0,0 +1,57 @@
|
|||
#ifndef GPSLISTMODEL_H
|
||||
#define GPSLISTMODEL_H
|
||||
|
||||
#include "gpslocation.h"
|
||||
#include <QObject>
|
||||
#include <QAbstractListModel>
|
||||
|
||||
class GpsTracker
|
||||
{
|
||||
private:
|
||||
quint64 m_when;
|
||||
qint32 m_latitude;
|
||||
qint32 m_longitude;
|
||||
QString m_name;
|
||||
|
||||
public:
|
||||
GpsTracker(struct gpsTracker *gt)
|
||||
{
|
||||
m_when = gt->when;
|
||||
m_latitude = gt->latitude.udeg;
|
||||
m_longitude = gt->longitude.udeg;
|
||||
m_name = gt->name;
|
||||
}
|
||||
GpsTracker();
|
||||
~GpsTracker();
|
||||
uint64_t when() const;
|
||||
int32_t latitude() const;
|
||||
int32_t longitude() const;
|
||||
QString name() const;
|
||||
};
|
||||
|
||||
class GpsListModel : public QAbstractListModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
enum GpsListRoles {
|
||||
GpsDateRole = Qt::UserRole + 1,
|
||||
GpsNameRole,
|
||||
GpsLatitudeRole,
|
||||
GpsLongitudeRole
|
||||
};
|
||||
|
||||
static GpsListModel *instance();
|
||||
GpsListModel(QObject *parent = 0);
|
||||
void addGpsFix(struct gpsTracker *g);
|
||||
void clear();
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QHash<int, QByteArray> roleNames() const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
|
||||
private:
|
||||
QList<GpsTracker> m_gpsFixes;
|
||||
static GpsListModel *m_instance;
|
||||
};
|
||||
|
||||
#endif // GPSLISTMODEL_H
|
|
@ -1,4 +1,5 @@
|
|||
#include "gpslocation.h"
|
||||
#include "gpslistmodel.h"
|
||||
#include "pref.h"
|
||||
#include "dive.h"
|
||||
#include "helpers.h"
|
||||
|
@ -195,12 +196,6 @@ int GpsLocation::getGpsNum() const
|
|||
return geoSettings->value("count", 0).toInt();
|
||||
}
|
||||
|
||||
struct gpsTracker {
|
||||
degrees_t latitude;
|
||||
degrees_t longitude;
|
||||
time_t when;
|
||||
};
|
||||
|
||||
static void copy_gps_location(struct gpsTracker *gps, struct dive *d)
|
||||
{
|
||||
struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid);
|
||||
|
|
|
@ -9,6 +9,13 @@
|
|||
#include <QSettings>
|
||||
#include <QNetworkReply>
|
||||
|
||||
struct gpsTracker {
|
||||
degrees_t latitude;
|
||||
degrees_t longitude;
|
||||
time_t when;
|
||||
QString name;
|
||||
};
|
||||
|
||||
class GpsLocation : QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
Loading…
Reference in a new issue