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

Untangle Library Linkage

Browse source 
with the adittion of gpslistmodel/location, the libraries
qt-models had a direct dependency on subsurface-core, and
subsurface-core had a direct dependency on qt-models, this is
bad.

Moving a bit of code around I'v managed to clean this out, and
also to clear a bit of uneeded code (GpsTracker and gpsTracker where
basically the same thing.)

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-08 13:11:49 -02:00 • committed by Dirk Hohndel
parent 7b155774c5
commit 89eed5d36e
7 changed files with 36 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-models/CMakeLists.txt
View file

@ -20,6 +20,8 @@ set(SUBSURFACE_MODELS_LIB_SRCS
divelocationmodel.cpp
divesitepicturesmodel.cpp
ssrfsortfilterproxymodel.cpp
divelistmodel.cpp
gpslistmodel.cpp
)
source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS})

54
qt-models/gpslistmodel.cpp
View file

@ -1,38 +1,6 @@
#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)
@ -40,13 +8,21 @@ GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent)
m_instance = this;
}
void GpsListModel::addGpsFix(gpsTracker *g)
void GpsListModel::addGpsFix(gpsTracker g)
{
beginInsertColumns(QModelIndex(), rowCount(), rowCount());
m_gpsFixes.append(GpsTracker(g));
m_gpsFixes.append(g);
endInsertRows();
}
void GpsListModel::update()
{
QVector<gpsTracker> trackers = GpsLocation::instance()->currentGPSInfo();
beginResetModel();
m_gpsFixes = trackers;
endResetModel();
}
void GpsListModel::clear()
{
if (m_gpsFixes.count()) {
@ -66,16 +42,16 @@ QVariant GpsListModel::data(const QModelIndex &index, int role) const
if (index.row() < 0 || index.row() > m_gpsFixes.count())
return QVariant();
const GpsTracker &gt = m_gpsFixes[index.row()];
const gpsTracker &gt = m_gpsFixes[index.row()];
if (role == GpsDateRole)
return get_short_dive_date_string(gt.when());
return get_short_dive_date_string(gt.when);
else if (role == GpsNameRole)
return QString(gt.name());
return gt.name;
else if (role == GpsLatitudeRole)
return QString::number(gt.latitude() / 1000000.0, 'f', 6);
return QString::number(gt.latitude.udeg / 1000000.0, 'f', 6);
else if (role == GpsLongitudeRole)
return QString::number(gt.longitude() / 1000000.0, 'f', 6);
return QString::number(gt.longitude.udeg / 1000000.0, 'f', 6);
return QVariant();
}

30
qt-models/gpslistmodel.h
View file

@ -5,30 +5,6 @@
#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
@ -43,14 +19,14 @@ public:
static GpsListModel *instance();
GpsListModel(QObject *parent = 0);
void addGpsFix(struct gpsTracker *g);
void addGpsFix(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;
void update();
private:
QList<GpsTracker> m_gpsFixes;
QVector<gpsTracker> m_gpsFixes;
static GpsListModel *m_instance;
};