Fix breakage caused by Linus' changes to tank pressure handling

[ext/subsurface.git] / dive.c

diff --git a/dive.c b/dive.c
index a1ef28c8e3d0deb9bceb686215ce5dfbaf0a53a2..bd1b92619198851b6bdc3f70b162c75f3af7cc48 100644 (file)
--- 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)
@@ -152,10 +219,9 @@ static void fixup_pressure(struct dive *dive, struct sample *sample)
        if (index >= MAX_CYLINDERS)
                return;
        cyl = dive->cylinder + index;
-       if (!cyl->start.mbar)
-               cyl->start.mbar = pressure;
-       if (!cyl->end.mbar || pressure < cyl->end.mbar)
-               cyl->end.mbar = pressure;
+       if (!cyl->sample_start.mbar)
+               cyl->sample_start.mbar = pressure;
+       cyl->sample_end.mbar = pressure;
 }
 
 struct dive *fixup_dive(struct dive *dive)
@@ -215,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;
 }
 
@@ -222,6 +300,7 @@ struct dive *fixup_dive(struct dive *dive)
 #define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
 #define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
 #define MERGE_TXT(res, a, b, n) res->n = merge_text(a->n, b->n)
+#define MERGE_NONZERO(res, a, b, n) res->n = a->n ? a->n : b->n
 
 static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
 {
@@ -405,12 +484,14 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
        int i;
        struct dive *res;
 
-       if (a->when != b->when)
+       if ((a->when >= b->when + 60) || (a->when <= b->when - 60))
                return NULL;
 
        res = alloc_dive();
 
        res->when = a->when;
+       MERGE_NONZERO(res, a, b, latitude);
+       MERGE_NONZERO(res, a, b, longitude);
        MERGE_TXT(res, a, b, location);
        MERGE_TXT(res, a, b, notes);
        MERGE_TXT(res, a, b, buddy);