Avoid using type 'gasmix_t': use 'struct gasmix' instead

[ext/subsurface.git] / dive.c

diff --git a/dive.c b/dive.c
index 5ddb6bc8087faae233843dc46683382934fe6792..e899c6ccbab5d26cff741f7040da86fd45d96b04 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -21,10 +21,46 @@
  */
 static void update_depth(depth_t *depth, int new)
 {
-       int old = depth->mm;
+       if (new) {
+               int old = depth->mm;
 
-       if (abs(old - new) > 1000)
-               depth->mm = new;
+               if (abs(old - new) > 1000)
+                       depth->mm = new;
+       }
+}
+
+static void update_duration(duration_t *duration, int new)
+{
+       if (new)
+               duration->seconds = new;
+}
+
+static void update_temperature(temperature_t *temperature, int new)
+{
+       if (new) {
+               int old = temperature->mkelvin;
+
+               if (abs(old - new) > 1000)
+                       temperature->mkelvin = new;
+       }
+}
+
+static void fixup_pressure(struct dive *dive, struct sample *sample)
+{
+       unsigned int pressure, index;
+       cylinder_t *cyl;
+
+       pressure = sample->cylinderpressure.mbar;
+       if (!pressure)
+               return;
+       index = sample->cylinderindex;
+       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;
 }
 
 struct dive *fixup_dive(struct dive *dive)
@@ -33,7 +69,6 @@ struct dive *fixup_dive(struct dive *dive)
        double depthtime = 0;
        int lasttime = 0;
        int start = -1, end = -1;
-       int startpress = 0, endpress = 0;
        int maxdepth = 0, mintemp = 0;
        int lastdepth = 0;
        int lasttemp = 0;
@@ -43,7 +78,6 @@ struct dive *fixup_dive(struct dive *dive)
                struct sample *sample = dive->sample + i;
                int time = sample->time.seconds;
                int depth = sample->depth.mm;
-               int press = sample->cylinderpressure.mbar;
                int temp = sample->temperature.mkelvin;
 
                if (lastdepth)
@@ -55,11 +89,9 @@ struct dive *fixup_dive(struct dive *dive)
                        if (depth > maxdepth)
                                maxdepth = depth;
                }
-               if (press) {
-                       endpress = press;
-                       if (!startpress)
-                               startpress = press;
-               }
+
+               fixup_pressure(dive, sample);
+
                if (temp) {
                        /*
                         * If we have consecutive identical
@@ -85,25 +117,19 @@ struct dive *fixup_dive(struct dive *dive)
        }
        if (end < 0)
                return dive;
-       dive->duration.seconds = end - start;
+
+       update_duration(&dive->duration, end - start);
        if (start != end)
-               update_depth(&dive->meandepth, depthtime / (end - start));
-       if (startpress)
-               dive->beginning_pressure.mbar = startpress;
-       if (endpress)
-               dive->end_pressure.mbar = endpress;
-       if (mintemp)
-               dive->watertemp.mkelvin = mintemp;
+               depthtime /= (end - start);
 
-       if (maxdepth)
-               update_depth(&dive->maxdepth, maxdepth);
+       update_depth(&dive->meandepth, depthtime);
+       update_temperature(&dive->watertemp, mintemp);
+       update_depth(&dive->maxdepth, maxdepth);
 
        return dive;
 }
 
 /* Don't pick a zero for MERGE_MIN() */
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#define MAX(a,b) ((a)>(b)?(a):(b))
 #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)
 
@@ -220,7 +246,7 @@ static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylind
        *res = *b;
 }
 
-static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
+static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b)
 {
        if (a->o2.permille)
                b = a;
@@ -231,6 +257,8 @@ static void merge_cylinder_info(cylinder_t *res, cylinder_t *a, cylinder_t *b)
 {
        merge_cylinder_type(&res->type, &a->type, &b->type);
        merge_cylinder_mix(&res->gasmix, &a->gasmix, &b->gasmix);
+       MERGE_MAX(res, a, b, start.mbar);
+       MERGE_MIN(res, a, b, end.mbar);
 }
 
 /*
@@ -261,8 +289,6 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
        MERGE_MAX(res, a, b, surfacetime.seconds);
        MERGE_MAX(res, a, b, airtemp.mkelvin);
        MERGE_MIN(res, a, b, watertemp.mkelvin);
-       MERGE_MAX(res, a, b, beginning_pressure.mbar);
-       MERGE_MAX(res, a, b, end_pressure.mbar);
        for (i = 0; i < MAX_CYLINDERS; i++)
                merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);