mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-01 00:33:24 +00:00
Automatically show Freshwater tag (but don't set it)
If the salinity is 10000 we show (but do not set) the Freshwater tag. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
51c4a5335b
commit
3611b0ae2d
3 changed files with 8 additions and 2 deletions
1
dive.h
1
dive.h
|
@ -44,6 +44,7 @@
|
|||
#define DTAG_RIVER (1 << 12)
|
||||
#define DTAG_NIGHT (1 << 13)
|
||||
#define DTAG_FRESH (1 << 14)
|
||||
#define DTAG_FRESH_NR 14
|
||||
#define DTAG_NR 15
|
||||
/* defined in statistics.c */
|
||||
extern char *dtag_names[DTAG_NR];
|
||||
|
|
|
@ -205,7 +205,6 @@ static void divetags(char *buffer, void *_tags)
|
|||
int *tags = _tags;
|
||||
int i;
|
||||
|
||||
*tags = 0;
|
||||
for (i = 0; i < DTAG_NR; i++) {
|
||||
if (strstr(buffer, dtag_names[i])) {
|
||||
/* stupidly we have 'cave' and 'cavern' */
|
||||
|
|
|
@ -548,6 +548,7 @@ static void show_single_dive_stats(struct dive *dive)
|
|||
struct dive *prev_dive;
|
||||
struct tm tm;
|
||||
struct divecomputer *dc;
|
||||
int more = 0;
|
||||
|
||||
process_all_dives(dive, &prev_dive);
|
||||
if (!dive)
|
||||
|
@ -643,7 +644,7 @@ static void show_single_dive_stats(struct dive *dive)
|
|||
/* Dive type */
|
||||
*buf = '\0';
|
||||
if (dive->dive_tags) {
|
||||
int i, more = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < DTAG_NR; i++)
|
||||
if(dive->dive_tags & (1 << i)) {
|
||||
|
@ -653,6 +654,11 @@ static void show_single_dive_stats(struct dive *dive)
|
|||
more = 1;
|
||||
}
|
||||
}
|
||||
if (!(dive->dive_tags & DTAG_FRESH) && dc->salinity == 10000) {
|
||||
if (more)
|
||||
strcat(buf, ", ");
|
||||
strcat(buf, _(dtag_names[DTAG_FRESH_NR]));
|
||||
}
|
||||
set_label(single_w.dive_type, buf);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue