X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=bd1b92619198851b6bdc3f70b162c75f3af7cc48;hb=0d7ad02f87ad02d3b9836c07230f2ddb3f1d3e14;hp=0341d09928cd4ef9ad9a974858a17c037db55a4c;hpb=9dce78c89fe77a107af7a8c962da19780485c3e2;p=ext%2Fsubsurface.git diff --git a/dive.c b/dive.c index 0341d09..bd1b926 100644 --- a/dive.c +++ b/dive.c @@ -26,6 +26,73 @@ void add_event(struct dive *dive, int time, int type, int flags, int value, cons while (*p) p = &(*p)->next; *p = ev; + remember_event(name); +} + +int get_pressure_units(unsigned int mb, const char **units) +{ + int pressure; + const char* unit; + + switch (output_units.pressure) { + case PASCAL: + pressure = mb * 100; + unit = "pascal"; + break; + case BAR: + pressure = (mb + 500) / 1000; + unit = "bar"; + break; + case PSI: + pressure = mbar_to_PSI(mb); + unit = "psi"; + break; + } + if (units) + *units = unit; + return pressure; +} + +double get_temp_units(unsigned int mk, const char **units) +{ + double deg; + const char *unit; + + if (output_units.temperature == FAHRENHEIT) { + deg = mkelvin_to_F(mk); + unit = UTF8_DEGREE "F"; + } else { + deg = mkelvin_to_C(mk); + unit = UTF8_DEGREE "C"; + } + if (units) + *units = unit; + return deg; +} + +double get_volume_units(unsigned int ml, int *frac, const char **units) +{ + int decimals; + double vol; + const char *unit; + + switch (output_units.volume) { + case LITER: + vol = ml / 1000.0; + unit = "l"; + decimals = 1; + break; + case CUFT: + vol = ml_to_cuft(ml); + unit = "cuft"; + decimals = 2; + break; + } + if (frac) + *frac = decimals; + if (units) + *units = unit; + return vol; } double get_depth_units(unsigned int mm, int *frac, const char **units) @@ -140,46 +207,21 @@ static void update_temperature(temperature_t *temperature, int new) } } -/* - * If you have more than 32 cylinders, you'd better have a 64-bit build. - * And if you have more than 64 cylinders, you need to use another tool, - * or fix this up to do something odd. - */ -static unsigned long fixup_pressure(struct dive *dive, struct sample *sample, unsigned long flags) +static void fixup_pressure(struct dive *dive, struct sample *sample) { - unsigned long mask; unsigned int pressure, index; cylinder_t *cyl; pressure = sample->cylinderpressure.mbar; if (!pressure) - return flags; + return; index = sample->cylinderindex; if (index >= MAX_CYLINDERS) - return flags; + return; cyl = dive->cylinder + index; - if (!cyl->start.mbar) - cyl->start.mbar = pressure; - /* - * If we already have an end pressure, without - * ever having seen a sample for this cylinder, - * that means that somebody set the end pressure - * by hand - */ - mask = 1ul << index; - if (cyl->end.mbar) { - if (!(flags & mask)) - return flags; - } - flags |= mask; - - /* we need to handle the user entering beginning and end tank pressures - * - maybe even IF we have samples. But for now if we have air pressure - * data in the samples, we use that instead of the minimum - * if (!cyl->end.mbar || pressure < cyl->end.mbar) - */ - cyl->end.mbar = pressure; - return flags; + if (!cyl->sample_start.mbar) + cyl->sample_start.mbar = pressure; + cyl->sample_end.mbar = pressure; } struct dive *fixup_dive(struct dive *dive) @@ -191,7 +233,6 @@ struct dive *fixup_dive(struct dive *dive) int maxdepth = 0, mintemp = 0; int lastdepth = 0; int lasttemp = 0; - unsigned long flags = 0; for (i = 0; i < dive->samples; i++) { struct sample *sample = dive->sample + i; @@ -209,7 +250,7 @@ struct dive *fixup_dive(struct dive *dive) maxdepth = depth; } - flags = fixup_pressure(dive, sample, flags); + fixup_pressure(dive, sample); if (temp) { /* @@ -240,6 +281,18 @@ struct dive *fixup_dive(struct dive *dive) update_temperature(&dive->watertemp, mintemp); update_depth(&dive->maxdepth, maxdepth); + add_people(dive->buddy); + add_people(dive->divemaster); + add_location(dive->location); + for (i = 0; i < MAX_CYLINDERS; i++) { + cylinder_t *cyl = dive->cylinder + i; + add_cylinder_description(&cyl->type); + if (cyl->sample_start.mbar == cyl->start.mbar) + cyl->start.mbar = 0; + if (cyl->sample_end.mbar == cyl->end.mbar) + cyl->end.mbar = 0; + } + return dive; }