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

Automatically show Freshwater tag (but don't set it)

Browse source 
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:
Dirk Hohndel 2013-04-09 19:46:05 -07:00
parent 51c4a5335b
commit 3611b0ae2d
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -44,6 +44,7 @@
#define DTAG_RIVER (1 << 12) #define DTAG_RIVER (1 << 12)
#define DTAG_NIGHT (1 << 13) #define DTAG_NIGHT (1 << 13)
#define DTAG_FRESH (1 << 14) #define DTAG_FRESH (1 << 14)
#define DTAG_FRESH_NR 14
#define DTAG_NR 15 #define DTAG_NR 15
/* defined in statistics.c */ /* defined in statistics.c */
extern char *dtag_names[DTAG_NR]; extern char *dtag_names[DTAG_NR];

1
parse-xml.c
View file

@ -205,7 +205,6 @@ static void divetags(char *buffer, void *_tags)
int *tags = _tags; int *tags = _tags;
int i; int i;
*tags = 0;
for (i = 0; i < DTAG_NR; i++) { for (i = 0; i < DTAG_NR; i++) {
if (strstr(buffer, dtag_names[i])) { if (strstr(buffer, dtag_names[i])) {
/* stupidly we have 'cave' and 'cavern' */ /* stupidly we have 'cave' and 'cavern' */

8
statistics.c
View file

@ -548,6 +548,7 @@ static void show_single_dive_stats(struct dive *dive)
struct dive *prev_dive; struct dive *prev_dive;
struct tm tm; struct tm tm;
struct divecomputer *dc; struct divecomputer *dc;
int more = 0;
process_all_dives(dive, &prev_dive); process_all_dives(dive, &prev_dive);
if (!dive) if (!dive)
@ -643,7 +644,7 @@ static void show_single_dive_stats(struct dive *dive)
/* Dive type */ /* Dive type */
*buf = '\0'; *buf = '\0';
if (dive->dive_tags) { if (dive->dive_tags) {
int i, more = 0; int i;
for (i = 0; i < DTAG_NR; i++) for (i = 0; i < DTAG_NR; i++)
if(dive->dive_tags & (1 << i)) { if(dive->dive_tags & (1 << i)) {
@ -653,6 +654,11 @@ static void show_single_dive_stats(struct dive *dive)
more = 1; 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); set_label(single_w.dive_type, buf);
} }