Sanitize and fix cylinder pressure overview

Doing per-dive cylinder start/end pressures is insane, when we can have
up to eight cylinders.  The cylinder start/end pressure cannot be per
dive, it needs to be per cylinder.

This makes the save format cleaner too, we have all the cylinder data in
just one place.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/dive.c b/dive.c
index 7fe6eb17b863f0ceeef887d81636fcb77991a3e8..5039abbbd58ef29880af4f7f2c978bb03137b757 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -29,16 +29,6 @@ static void update_depth(depth_t *depth, int new)
        }
 }
 
-static void update_pressure(pressure_t *pressure, int new)
-{
-       if (new) {
-               int old = pressure->mbar;
-
-               if (abs(old - new) > 1000)
-                       pressure->mbar = new;
-       }
-}
-
 static void update_duration(duration_t *duration, int new)
 {
        if (new)
@@ -55,13 +45,30 @@ static void update_temperature(temperature_t *temperature, int 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)
 {
        int i;
        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;
@@ -71,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)
@@ -83,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
@@ -119,8 +123,6 @@ struct dive *fixup_dive(struct dive *dive)
                depthtime /= (end - start);
 
        update_depth(&dive->meandepth, depthtime);
-       update_pressure(&dive->beginning_pressure, startpress);
-       update_pressure(&dive->end_pressure, endpress);
        update_temperature(&dive->watertemp, mintemp);
        update_depth(&dive->maxdepth, maxdepth);
 
@@ -257,6 +259,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);
 }
 
 /*
@@ -287,8 +291,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);
 

diff --git a/dive.h b/dive.h
index 08194f6a91caceec9692934b97fb1be67507e7bc..65337303a05d893e7e894ac764ff46a444c0ab61 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -81,6 +81,7 @@ typedef struct {
 typedef struct {
        cylinder_type_t type;
        gasmix_t gasmix;
+       pressure_t start, end;
 } cylinder_t;
 
 static inline int to_feet(depth_t depth)
@@ -118,7 +119,6 @@ struct dive {
        duration_t duration, surfacetime;
        depth_t visibility;
        temperature_t airtemp, watertemp;
-       pressure_t beginning_pressure, end_pressure;
        cylinder_t cylinder[MAX_CYLINDERS];
        int samples;
        struct sample sample[];

diff --git a/parse-xml.c b/parse-xml.c
index b123bb39f6998862bf794644cd9f31fbb791de83..f68aae67e32f4f5417c1d27a8414b66bb610a5f8 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -645,9 +645,9 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (MATCH(".watertemp", temperature, &dive->watertemp))
                return;
-       if (MATCH(".cylinderstartpressure", pressure, &dive->beginning_pressure))
+       if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
                return;
-       if (MATCH(".cylinderendpressure", pressure, &dive->end_pressure))
+       if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
                return;
        if (MATCH(".location", utf8_string, &dive->location))
                return;
@@ -660,6 +660,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description))
                return;
+       if (MATCH(".cylinder.start", pressure, &dive->cylinder[cylinder_index].start))
+               return;
+       if (MATCH(".cylinder.end", pressure, &dive->cylinder[cylinder_index].end))
+               return;
 
        if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2))
                return;

diff --git a/profile.c b/profile.c
index 070e6fa7054445e26031335c4c1b5e1ac35ccbff..5c30fbb5e5768a0c34b38c824b7e497eb64be6ba 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -106,6 +106,9 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
                struct sample *sample = dive->sample + i;
                double bar;
 
+               /* FIXME! We only track cylinder 0 right now */
+               if (sample->cylinderindex)
+                       continue;
                if (!sample->cylinderpressure.mbar)
                        continue;
                bar = sample->cylinderpressure.mbar;
@@ -131,7 +134,7 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 
        cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
 
-       cairo_move_to(cr, SCALE(0, dive->beginning_pressure.mbar));
+       cairo_move_to(cr, SCALE(0, dive->cylinder[0].start.mbar));
        for (i = 1; i < dive->samples; i++) {
                int sec, mbar;
                struct sample *sample = dive->sample + i;
@@ -142,7 +145,7 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
                        continue;
                cairo_line_to(cr, SCALE(sec, mbar));
        }
-       cairo_line_to(cr, SCALE(dive->duration.seconds, dive->end_pressure.mbar));
+       cairo_line_to(cr, SCALE(dive->duration.seconds, dive->cylinder[0].end.mbar));
        cairo_stroke(cr);
 }
 

diff --git a/save-xml.c b/save-xml.c
index f629b452e1960760a3d61380b3f5733c7b767fdf..ddee64e2d1bfd13e97e118863f922eda4fef42d6 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -133,8 +133,6 @@ static void save_overview(FILE *f, struct dive *dive)
        show_temperature(f, dive->watertemp, "  <watertemp>", "</watertemp>\n");
        show_duration(f, dive->duration, "  <duration>", "</duration>\n");
        show_duration(f, dive->surfacetime, "  <surfacetime>", "</surfacetime>\n");
-       show_pressure(f, dive->beginning_pressure, "  <cylinderstartpressure>", "</cylinderstartpressure>\n");
-       show_pressure(f, dive->end_pressure, "  <cylinderendpressure>", "</cylinderendpressure>\n");
        show_utf8(f, dive->location, "  <location>","</location>\n");
        show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
@@ -149,9 +147,11 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                const char *description = cylinder->type.description;
                int o2 = cylinder->gasmix.o2.permille;
                int he = cylinder->gasmix.he.permille;
+               int start = cylinder->start.mbar;
+               int end = cylinder->end.mbar;
 
                /* No cylinder information at all? */
-               if (!o2 && !volume)
+               if (!o2 && !volume && !start && !end)
                        return;
                fprintf(f, "  <cylinder");
                if (o2) {
@@ -163,6 +163,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                        show_milli(f, " size='", volume, " l", "'");
                if (description)
                        fprintf(f, " description='%s'", description);
+               show_pressure(f, cylinder->start, " start='", "'");
+               show_pressure(f, cylinder->end, " end='", "'");
                fprintf(f, " />\n");
        }
 }