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

core: include divesite table directly in divelog

Browse source 
Having this as a pointer is an artifact from the C/C++ split.
The divesitetable header is small enough so that we can
include it directly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-08 16:30:24 +02:00 • committed by bstoeger
parent 7792f54a73
commit 5af9d28291
29 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/divesiteimportmodel.cpp
View file

@ -11,7 +11,7 @@ DivesiteImportedModel::DivesiteImportedModel(dive_site_table &table, QObject *o)
{
checkStates.resize(importedSitesTable.size());
for (const auto &[row, item]: enumerated_range(importedSitesTable))
checkStates[row] = !divelog.sites->get_by_gps(&item->location);
checkStates[row] = !divelog.sites.get_by_gps(&item->location);
}
int DivesiteImportedModel::columnCount(const QModelIndex &) const
@ -69,7 +69,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
case NEAREST: {
// 40075000 is circumference of the earth in meters
struct dive_site *nearest_ds =
divelog.sites->get_by_gps_proximity(ds->location, 40075000);
divelog.sites.get_by_gps_proximity(ds->location, 40075000);
if (nearest_ds)
return QString::fromStdString(nearest_ds->name);
else
@ -78,7 +78,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
case DISTANCE: {
unsigned int distance = 0;
struct dive_site *nearest_ds =
divelog.sites->get_by_gps_proximity(ds->location, 40075000);
divelog.sites.get_by_gps_proximity(ds->location, 40075000);
if (nearest_ds)
distance = get_distance(ds->location, nearest_ds->location);
return distance_string(distance);