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

Improve the code handling air temperature

Browse source 
Better helper functions make for easier to understand code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-02-14 15:18:48 -08:00 • committed by Dirk Hohndel
parent b4c2fcc802
commit c6da79e1b0
3 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dive.c
View file

@ -484,34 +484,35 @@ static void fixup_watertemp(struct dive *dive)
dive->watertemp.mkelvin = (sum + nr / 2) / nr; dive->watertemp.mkelvin = (sum + nr / 2) / nr;
} }
void fixup_airtemp(struct dive *dive) /*
* What do the dive computers say the air temperature is?
*/
unsigned int dc_airtemp(struct divecomputer *dc)
{ {
struct divecomputer *dc;
int sum = 0, nr = 0; int sum = 0, nr = 0;
if (dive->airtemp.mkelvin) do {
return;
for_each_dc(dive, dc) {
if (dc->airtemp.mkelvin) { if (dc->airtemp.mkelvin) {
sum += dc->airtemp.mkelvin; sum += dc->airtemp.mkelvin;
nr++; nr++;
} }
} } while ((dc = dc->next) != NULL);
if (nr) if (!nr)
dive->airtemp.mkelvin = (sum + nr / 2) / nr; return 0;
return (sum + nr / 2) / nr;
}
static void fixup_airtemp(struct dive *dive)
{
if (!dive->airtemp.mkelvin)
dive->airtemp.mkelvin = dc_airtemp(&dive->dc);
} }
/* zero out the airtemp in the dive structure if it was just created by /* zero out the airtemp in the dive structure if it was just created by
* running fixup on the dive. keep it if it had been edited by hand */ * running fixup on the dive. keep it if it had been edited by hand */
static void un_fixup_airtemp(struct dive *a) static void un_fixup_airtemp(struct dive *a)
{ {
temperature_t temp; if (a->airtemp.mkelvin && a->airtemp.mkelvin == dc_airtemp(&a->dc))
temp.mkelvin = a->airtemp.mkelvin;
a->airtemp.mkelvin = 0;
fixup_airtemp(a);
if (a->airtemp.mkelvin && a->airtemp.mkelvin != temp.mkelvin)
a->airtemp.mkelvin = temp.mkelvin;
else
a->airtemp.mkelvin = 0; a->airtemp.mkelvin = 0;
} }

2
dive.h
View file

@ -561,7 +561,7 @@ extern void finish_sample(struct divecomputer *dc);
extern void sort_table(struct dive_table *table); extern void sort_table(struct dive_table *table);
extern void report_dives(gboolean imported, gboolean prefer_imported); extern void report_dives(gboolean imported, gboolean prefer_imported);
extern struct dive *fixup_dive(struct dive *dive); extern struct dive *fixup_dive(struct dive *dive);
extern void fixup_airtemp(struct dive *dive); extern unsigned int dc_airtemp(struct divecomputer *dc);
extern struct dive *merge_dives(struct dive *a, struct dive *b, int offset, gboolean prefer_downloaded); extern struct dive *merge_dives(struct dive *a, struct dive *b, int offset, gboolean prefer_downloaded);
extern struct dive *try_to_merge(struct dive *a, struct dive *b, gboolean prefer_downloaded); extern struct dive *try_to_merge(struct dive *a, struct dive *b, gboolean prefer_downloaded);
extern void renumber_dives(int nr); extern void renumber_dives(int nr);

17
save-xml.c
View file

@ -152,17 +152,14 @@ static void save_depths(FILE *f, struct divecomputer *dc)
static void save_dive_temperature(FILE *f, struct dive *dive) static void save_dive_temperature(FILE *f, struct dive *dive)
{ {
temperature_t temp; if (!dive->airtemp.mkelvin)
temp.mkelvin = dive->airtemp.mkelvin; return;
dive->airtemp.mkelvin = 0; if (dive->airtemp.mkelvin == dc_airtemp(&dive->dc))
fixup_airtemp(dive); return;
if (dive->airtemp.mkelvin && temp.mkelvin != dive->airtemp.mkelvin) {
fputs(" <divetemperature", f);
show_temperature(f, temp, " air='", "'");
fputs(" />\n", f);
}
dive->airtemp.mkelvin = temp.mkelvin;
fputs(" <divetemperature", f);
show_temperature(f, dive->airtemp, " air='", "'");
fputs("/>\n", f);
} }
static void save_temperatures(FILE *f, struct divecomputer *dc) static void save_temperatures(FILE *f, struct divecomputer *dc)