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: move get_distance() from divesite.cpp to units.cpp

Browse source 
This gives the distance between to location_t objects. It is
unclear why this was in divesite.cpp.

Moreover pass by value, not raw pointer.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-11 15:18:37 +02:00 • committed by bstoeger
parent 2de6f69c19
commit 7d7766be9a
9 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/locationinformation.cpp
View file

@ -390,7 +390,7 @@ bool DiveLocationFilterProxyModel::lessThan(const QModelIndex &source_left, cons
// The dive sites are -2 because of the first two items.
auto loc1 = (*divelog.sites)[source_left.row() - 2]->location;
auto loc2 = (*divelog.sites)[source_right.row() - 2]->location;
return get_distance(&loc1, &currentLocation) < get_distance(&loc2, &currentLocation);
return get_distance(loc1, currentLocation) < get_distance(loc2, currentLocation);
}
return source_left.data().toString().compare(source_right.data().toString(), Qt::CaseInsensitive) < 0;
}

2
desktop-widgets/modeldelegates.cpp
View file

@ -478,7 +478,7 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
if (ds->location == currentLocation) {
bottomText += tr(" (same GPS fix)");
} else {
int distanceMeters = get_distance(&ds->location, &currentLocation);
int distanceMeters = get_distance(ds->location, currentLocation);
QString distance = distance_string(distanceMeters);
size_t nr = ds->nr_of_dives();
bottomText += tr(" (~%1 away").arg(distance);