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

Rename dive gas function and defines for clarity

Browse source 
This renames the dive gas functions to not talk about just nitrox, and
to instead talk about gas.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-07-20 15:07:57 +02:00 committed by Dirk Hohndel
parent 619c1b3ec9
commit d453d5cb37
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
divelist.c
View file

@ -434,14 +434,14 @@ void update_cylinder_related_info(struct dive *dive)
} }
} }
#define MAX_NITROX_STRING 80 #define MAX_GAS_STRING 80
#define UTF8_ELLIPSIS "\xE2\x80\xA6" #define UTF8_ELLIPSIS "\xE2\x80\xA6"
/* callers needs to free the string */ /* callers needs to free the string */
char *get_nitrox_string(struct dive *dive) char *get_dive_gas_string(struct dive *dive)
{ {
int o2, he, o2low; int o2, he, o2low;
char *buffer = malloc(MAX_NITROX_STRING); char *buffer = malloc(MAX_GAS_STRING);
if (buffer) { if (buffer) {
get_dive_gas(dive, &o2, &he, &o2low); get_dive_gas(dive, &o2, &he, &o2low);
@ -450,12 +450,12 @@ char *get_nitrox_string(struct dive *dive)
o2low = (o2low + 5) / 10; o2low = (o2low + 5) / 10;
if (he) if (he)
snprintf(buffer, MAX_NITROX_STRING, "%d/%d", o2, he); snprintf(buffer, MAX_GAS_STRING, "%d/%d", o2, he);
else if (o2) else if (o2)
if (o2 == o2low) if (o2 == o2low)
snprintf(buffer, MAX_NITROX_STRING, "%d", o2); snprintf(buffer, MAX_GAS_STRING, "%d", o2);
else else
snprintf(buffer, MAX_NITROX_STRING, "%d" UTF8_ELLIPSIS "%d", o2low, o2); snprintf(buffer, MAX_GAS_STRING, "%d" UTF8_ELLIPSIS "%d", o2low, o2);
else else
strcpy(buffer, translate("gettextFromC", "air")); strcpy(buffer, translate("gettextFromC", "air"));
} }

2
divelist.h
View file

@ -15,7 +15,7 @@ extern double init_decompression(struct dive *dive);
/* divelist core logic functions */ /* divelist core logic functions */
extern void process_dives(bool imported, bool prefer_imported); extern void process_dives(bool imported, bool prefer_imported);
extern char *get_nitrox_string(struct dive *dive); extern char *get_dive_gas_string(struct dive *dive);
extern dive_trip_t *find_trip_by_idx(int idx); extern dive_trip_t *find_trip_by_idx(int idx);

2
qt-ui/models.cpp
View file

@ -1147,7 +1147,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = QString(dive->cylinder[0].type.description); retVal = QString(dive->cylinder[0].type.description);
break; break;
case GAS: case GAS:
retVal = QString(get_nitrox_string(dive)); retVal = QString(get_dive_gas_string(dive));
break; break;
case SAC: case SAC:
retVal = displaySac(); retVal = displaySac();