mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add nr of dives at the site to completion string

Browse source 
I'm not convinced that this is useful enough to keep, but let's give it a
try and see what people think.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-18 13:34:05 -07:00
parent 021a151f03
commit bd4629b293
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
divesite.c
View file

@ -108,6 +108,19 @@ struct dive_site *alloc_dive_site()
return ds; return ds;
} }
int nr_of_dives_at_dive_site(uint32_t uuid, bool select_only)
{
int j;
int nr = 0;
struct dive *d;
for_each_dive(j, d) {
if (d->dive_site_uuid == uuid && (!select_only || d->selected)) {
nr++;
}
}
return nr;
}
bool is_dive_site_used(uint32_t uuid, bool select_only) bool is_dive_site_used(uint32_t uuid, bool select_only)
{ {
int j; int j;

1
divesite.h
View file

@ -50,6 +50,7 @@ static inline struct dive_site *get_dive_site_by_uuid(uint32_t uuid)
} }
struct dive_site *alloc_dive_site(); struct dive_site *alloc_dive_site();
int nr_of_dives_at_dive_site(uint32_t uuid, bool select_only);
bool is_dive_site_used(uint32_t uuid, bool select_only); bool is_dive_site_used(uint32_t uuid, bool select_only);
void delete_dive_site(uint32_t id); void delete_dive_site(uint32_t id);
uint32_t create_dive_site(const char *name); uint32_t create_dive_site(const char *name);

4
qt-ui/modeldelegates.cpp
View file

@ -542,7 +542,9 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
} else { } else {
int distanceMeters = get_distance(ds->latitude, ds->longitude, displayed_dive_site.latitude, displayed_dive_site.longitude); int distanceMeters = get_distance(ds->latitude, ds->longitude, displayed_dive_site.latitude, displayed_dive_site.longitude);
QString distance = distance_string(distanceMeters); QString distance = distance_string(distanceMeters);
bottomText += tr(" (~%1 away)").arg(distance); int nr = nr_of_dives_at_dive_site(ds->uuid, false);
bottomText += tr(" (~%1 away").arg(distance);
bottomText += tr(", %n dive(s) here)", 0, nr);
} }
} }
if (bottomText.isEmpty()) { if (bottomText.isEmpty()) {