2017-07-29 05:01:33 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include "maplocationmodel.h"
|
2019-05-09 19:33:01 +00:00
|
|
|
#include "divelocationmodel.h"
|
2018-10-26 15:03:54 +00:00
|
|
|
#include "core/divesite.h"
|
2019-11-17 17:13:55 +00:00
|
|
|
#include "core/divefilter.h"
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
#include "core/divelog.h"
|
2022-08-17 00:17:04 +00:00
|
|
|
#include "core/settings/qPrefDisplay.h"
|
2020-11-15 03:21:16 +00:00
|
|
|
#if !defined(SUBSURFACE_MOBILE) && !defined(SUBSURFACE_DOWNLOADER)
|
2019-05-01 21:33:45 +00:00
|
|
|
#include "qt-models/filtermodels.h"
|
2019-08-30 13:25:59 +00:00
|
|
|
#include "desktop-widgets/mapwidget.h"
|
2019-05-01 21:33:45 +00:00
|
|
|
#endif
|
2017-07-29 05:01:33 +00:00
|
|
|
|
2019-05-01 21:33:45 +00:00
|
|
|
#define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0
|
|
|
|
|
2022-08-17 00:14:09 +00:00
|
|
|
// MKW If "Map Short Names" preference is set, only return the last component
|
|
|
|
// of the full dive site name.
|
|
|
|
// Example:
|
|
|
|
// Japan/Izu Peninsula/Atami/Chinsen-Aft
|
|
|
|
// Short name: Chinsen-Aft
|
|
|
|
static QString siteMapDisplayName(const char *sitename)
|
|
|
|
{
|
|
|
|
const char Separator = '/';
|
|
|
|
QString fullname(sitename);
|
|
|
|
|
2022-08-17 00:17:04 +00:00
|
|
|
if (!qPrefDisplay::map_short_names() ) {
|
|
|
|
return fullname;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString name = fullname.section(Separator, -1).trimmed();
|
2022-08-17 00:14:09 +00:00
|
|
|
if (name.isEmpty()) {
|
|
|
|
name = fullname;
|
|
|
|
}
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-08-31 22:18:15 +00:00
|
|
|
MapLocation::MapLocation(struct dive_site *dsIn, QGeoCoordinate coordIn, QString nameIn, bool selectedIn) :
|
|
|
|
divesite(dsIn), coordinate(coordIn), name(nameIn), selected(selectedIn)
|
2017-07-29 05:01:33 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2019-08-30 13:25:59 +00:00
|
|
|
// Check whether we are in divesite-edit mode. This doesn't
|
|
|
|
// exist on mobile. And on desktop we have to access the MapWidget.
|
|
|
|
// Simplify this!
|
|
|
|
static bool inEditMode()
|
|
|
|
{
|
2020-11-15 03:21:16 +00:00
|
|
|
#if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER)
|
2019-08-30 13:25:59 +00:00
|
|
|
return false;
|
|
|
|
#else
|
|
|
|
return MapWidget::instance()->editMode();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-07-29 05:01:33 +00:00
|
|
|
QVariant MapLocation::getRole(int role) const
|
|
|
|
{
|
|
|
|
switch (role) {
|
2019-09-01 14:38:48 +00:00
|
|
|
case RoleDivesite:
|
2019-08-31 22:18:15 +00:00
|
|
|
return QVariant::fromValue(divesite);
|
2019-09-01 14:38:48 +00:00
|
|
|
case RoleCoordinate:
|
2019-08-31 22:18:15 +00:00
|
|
|
return QVariant::fromValue(coordinate);
|
2019-09-01 14:38:48 +00:00
|
|
|
case RoleName:
|
2019-08-31 22:18:15 +00:00
|
|
|
return QVariant::fromValue(name);
|
2019-09-01 14:38:48 +00:00
|
|
|
case RolePixmap:
|
2019-08-31 22:18:15 +00:00
|
|
|
return selected ? QString("qrc:///dive-location-marker-selected-icon") :
|
2019-08-30 13:25:59 +00:00
|
|
|
inEditMode() ? QString("qrc:///dive-location-marker-inactive-icon") :
|
|
|
|
QString("qrc:///dive-location-marker-icon");
|
2019-09-01 14:38:48 +00:00
|
|
|
case RoleZ:
|
2019-08-31 22:18:15 +00:00
|
|
|
return selected ? 1 : 0;
|
2019-09-01 14:38:48 +00:00
|
|
|
case RoleIsSelected:
|
2019-08-31 22:18:15 +00:00
|
|
|
return QVariant::fromValue(selected);
|
2017-07-29 05:01:33 +00:00
|
|
|
default:
|
|
|
|
return QVariant();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-01 22:09:59 +00:00
|
|
|
MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent)
|
2018-10-26 15:03:54 +00:00
|
|
|
{
|
2019-05-09 19:33:01 +00:00
|
|
|
connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MapLocationModel::diveSiteChanged);
|
2017-07-29 05:01:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
MapLocationModel::~MapLocationModel()
|
|
|
|
{
|
2019-05-01 21:33:45 +00:00
|
|
|
qDeleteAll(m_mapLocations);
|
2017-07-29 05:01:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QVariant MapLocationModel::data(const QModelIndex & index, int role) const
|
|
|
|
{
|
|
|
|
if (index.row() < 0 || index.row() >= m_mapLocations.size())
|
|
|
|
return QVariant();
|
|
|
|
|
|
|
|
return m_mapLocations.at(index.row())->getRole(role);
|
|
|
|
}
|
|
|
|
|
|
|
|
QHash<int, QByteArray> MapLocationModel::roleNames() const
|
|
|
|
{
|
2019-08-31 21:17:04 +00:00
|
|
|
QHash<int, QByteArray> roles;
|
2019-09-01 14:38:48 +00:00
|
|
|
roles[MapLocation::RoleDivesite] = "divesite";
|
|
|
|
roles[MapLocation::RoleCoordinate] = "coordinate";
|
|
|
|
roles[MapLocation::RoleName] = "name";
|
|
|
|
roles[MapLocation::RolePixmap] = "pixmap";
|
|
|
|
roles[MapLocation::RoleZ] = "z";
|
|
|
|
roles[MapLocation::RoleIsSelected] = "isSelected";
|
2019-08-31 21:17:04 +00:00
|
|
|
return roles;
|
2017-07-29 05:01:33 +00:00
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
int MapLocationModel::rowCount(const QModelIndex&) const
|
2017-07-29 05:01:33 +00:00
|
|
|
{
|
|
|
|
return m_mapLocations.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
void MapLocationModel::add(MapLocation *location)
|
|
|
|
{
|
|
|
|
beginInsertRows(QModelIndex(), m_mapLocations.size(), m_mapLocations.size());
|
|
|
|
m_mapLocations.append(location);
|
|
|
|
endInsertRows();
|
|
|
|
}
|
|
|
|
|
2019-05-03 21:16:40 +00:00
|
|
|
const QVector<dive_site *> &MapLocationModel::selectedDs() const
|
|
|
|
{
|
|
|
|
return m_selectedDs;
|
|
|
|
}
|
|
|
|
|
2019-05-08 19:35:49 +00:00
|
|
|
static bool hasVisibleDive(const dive_site *ds)
|
|
|
|
{
|
|
|
|
return std::any_of(&ds->dives.dives[0], &ds->dives.dives[ds->dives.nr],
|
|
|
|
[] (const dive *d) { return !d->hidden_by_filter; });
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool hasSelectedDive(const dive_site *ds)
|
2017-07-29 05:01:33 +00:00
|
|
|
{
|
2019-05-08 19:35:49 +00:00
|
|
|
return std::any_of(&ds->dives.dives[0], &ds->dives.dives[ds->dives.nr],
|
|
|
|
[] (const dive *d) { return d->selected; });
|
|
|
|
}
|
2019-05-01 21:33:45 +00:00
|
|
|
|
2019-08-30 14:51:59 +00:00
|
|
|
void MapLocationModel::selectionChanged()
|
|
|
|
{
|
|
|
|
if (m_mapLocations.isEmpty())
|
|
|
|
return;
|
|
|
|
for(MapLocation *m: m_mapLocations)
|
2019-08-31 22:18:15 +00:00
|
|
|
m->selected = m_selectedDs.contains(m->divesite);
|
2019-08-30 14:51:59 +00:00
|
|
|
emit dataChanged(createIndex(0, 0), createIndex(m_mapLocations.size() - 1, 0));
|
|
|
|
}
|
|
|
|
|
2019-05-08 20:15:01 +00:00
|
|
|
void MapLocationModel::reload(QObject *map)
|
2019-05-08 19:35:49 +00:00
|
|
|
{
|
2019-05-01 21:33:45 +00:00
|
|
|
beginResetModel();
|
2017-07-29 05:01:33 +00:00
|
|
|
|
|
|
|
qDeleteAll(m_mapLocations);
|
|
|
|
m_mapLocations.clear();
|
2019-05-01 22:09:59 +00:00
|
|
|
m_selectedDs.clear();
|
2019-05-01 21:33:45 +00:00
|
|
|
|
|
|
|
QMap<QString, MapLocation *> locationNameMap;
|
|
|
|
|
2020-11-15 03:21:16 +00:00
|
|
|
#if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER)
|
2019-05-01 21:33:45 +00:00
|
|
|
bool diveSiteMode = false;
|
|
|
|
#else
|
|
|
|
// In dive site mode (that is when either editing a dive site or on
|
|
|
|
// the dive site tab), we want to show all dive sites, not only those
|
2019-05-03 21:37:42 +00:00
|
|
|
// of the non-hidden dives. Moreover, the selected dive sites are those
|
|
|
|
// that we filter for.
|
2019-11-17 17:13:55 +00:00
|
|
|
bool diveSiteMode = DiveFilter::instance()->diveSiteMode();
|
2019-05-03 21:37:42 +00:00
|
|
|
if (diveSiteMode)
|
2019-11-17 17:13:55 +00:00
|
|
|
m_selectedDs = DiveFilter::instance()->filteredDiveSites();
|
2019-05-01 21:33:45 +00:00
|
|
|
#endif
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (int i = 0; i < divelog.sites->nr; ++i) {
|
|
|
|
struct dive_site *ds = divelog.sites->dive_sites[i];
|
2019-05-08 20:15:01 +00:00
|
|
|
QGeoCoordinate dsCoord;
|
2019-05-08 19:35:49 +00:00
|
|
|
|
|
|
|
// Don't show dive sites of hidden dives, unless we're in dive site edit mode.
|
|
|
|
if (!diveSiteMode && !hasVisibleDive(ds))
|
2019-05-01 21:33:45 +00:00
|
|
|
continue;
|
2019-05-08 20:15:01 +00:00
|
|
|
if (!dive_site_has_gps_location(ds)) {
|
|
|
|
// Dive sites that do not have a gps location are not shown in normal mode.
|
|
|
|
// In dive-edit mode, selected sites are placed at the center of the map,
|
|
|
|
// so that the user can drag them somewhere without having to enter coordinates.
|
|
|
|
if (!diveSiteMode || !m_selectedDs.contains(ds) || !map)
|
|
|
|
continue;
|
|
|
|
dsCoord = map->property("center").value<QGeoCoordinate>();
|
|
|
|
} else {
|
|
|
|
qreal latitude = ds->location.lat.udeg * 0.000001;
|
|
|
|
qreal longitude = ds->location.lon.udeg * 0.000001;
|
|
|
|
dsCoord = QGeoCoordinate(latitude, longitude);
|
|
|
|
}
|
2019-05-08 19:35:49 +00:00
|
|
|
if (!diveSiteMode && hasSelectedDive(ds) && !m_selectedDs.contains(ds))
|
2019-05-01 22:09:59 +00:00
|
|
|
m_selectedDs.append(ds);
|
2022-08-17 00:14:09 +00:00
|
|
|
QString name = siteMapDisplayName(ds->name);
|
2019-05-08 19:35:49 +00:00
|
|
|
if (!diveSiteMode) {
|
|
|
|
// don't add dive locations with the same name, unless they are
|
|
|
|
// at least MIN_DISTANCE_BETWEEN_DIVE_SITES_M apart
|
|
|
|
if (locationNameMap.contains(name)) {
|
|
|
|
MapLocation *existingLocation = locationNameMap[name];
|
2019-08-31 22:18:15 +00:00
|
|
|
QGeoCoordinate coord = existingLocation->coordinate;
|
2019-05-08 19:35:49 +00:00
|
|
|
if (dsCoord.distanceTo(coord) < MIN_DISTANCE_BETWEEN_DIVE_SITES_M)
|
|
|
|
continue;
|
|
|
|
}
|
2019-05-01 21:33:45 +00:00
|
|
|
}
|
2019-08-30 13:25:59 +00:00
|
|
|
bool selected = m_selectedDs.contains(ds);
|
|
|
|
MapLocation *location = new MapLocation(ds, dsCoord, name, selected);
|
2019-05-01 21:33:45 +00:00
|
|
|
m_mapLocations.append(location);
|
2019-07-27 20:30:09 +00:00
|
|
|
if (!diveSiteMode)
|
|
|
|
locationNameMap[name] = location;
|
2019-05-01 21:33:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
endResetModel();
|
2017-07-29 05:01:33 +00:00
|
|
|
}
|
|
|
|
|
2019-08-30 10:38:25 +00:00
|
|
|
void MapLocationModel::setSelected(struct dive_site *ds)
|
2018-10-26 15:03:54 +00:00
|
|
|
{
|
2019-05-01 22:09:59 +00:00
|
|
|
m_selectedDs.clear();
|
2019-08-30 10:38:25 +00:00
|
|
|
if (ds)
|
|
|
|
m_selectedDs.append(ds);
|
2018-10-26 15:03:54 +00:00
|
|
|
}
|
|
|
|
|
2019-08-30 15:38:54 +00:00
|
|
|
void MapLocationModel::setSelected(const QVector<dive_site *> &divesites)
|
|
|
|
{
|
|
|
|
m_selectedDs = divesites;
|
|
|
|
}
|
|
|
|
|
2018-10-26 15:03:54 +00:00
|
|
|
MapLocation *MapLocationModel::getMapLocation(const struct dive_site *ds)
|
2017-07-29 05:01:33 +00:00
|
|
|
{
|
|
|
|
MapLocation *location;
|
|
|
|
foreach(location, m_mapLocations) {
|
2019-08-31 22:18:15 +00:00
|
|
|
if (ds == location->divesite)
|
2017-07-29 05:01:33 +00:00
|
|
|
return location;
|
|
|
|
}
|
2022-08-17 01:20:11 +00:00
|
|
|
return nullptr;
|
2017-07-29 05:01:33 +00:00
|
|
|
}
|
2017-11-09 16:43:21 +00:00
|
|
|
|
2019-05-09 19:33:01 +00:00
|
|
|
void MapLocationModel::diveSiteChanged(struct dive_site *ds, int field)
|
2017-11-09 16:43:21 +00:00
|
|
|
{
|
2019-05-09 19:33:01 +00:00
|
|
|
// Find dive site
|
|
|
|
int row;
|
|
|
|
for (row = 0; row < m_mapLocations.size(); ++row) {
|
2019-08-31 22:18:15 +00:00
|
|
|
if (m_mapLocations[row]->divesite == ds)
|
2019-05-09 19:33:01 +00:00
|
|
|
break;
|
|
|
|
}
|
2019-08-31 22:18:15 +00:00
|
|
|
if (row == m_mapLocations.size())
|
2019-05-09 19:33:01 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
switch (field) {
|
|
|
|
case LocationInformationModel::LOCATION:
|
|
|
|
if (has_location(&ds->location)) {
|
|
|
|
const qreal latitude_r = ds->location.lat.udeg * 0.000001;
|
|
|
|
const qreal longitude_r = ds->location.lon.udeg * 0.000001;
|
|
|
|
QGeoCoordinate coord(latitude_r, longitude_r);
|
2019-08-31 22:18:15 +00:00
|
|
|
m_mapLocations[row]->coordinate = coord;
|
2017-11-09 16:43:21 +00:00
|
|
|
}
|
2019-05-09 19:33:01 +00:00
|
|
|
break;
|
|
|
|
case LocationInformationModel::NAME:
|
2022-08-17 00:14:09 +00:00
|
|
|
m_mapLocations[row]->name = siteMapDisplayName(ds->name);
|
2019-05-09 19:33:01 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2017-11-09 16:43:21 +00:00
|
|
|
}
|
2019-05-09 19:33:01 +00:00
|
|
|
|
|
|
|
emit dataChanged(createIndex(row, 0), createIndex(row, 0));
|
2017-11-09 16:43:21 +00:00
|
|
|
}
|