Clear O2/H2 field if there is no tank information

[ext/subsurface.git] / profile.c

diff --git a/profile.c b/profile.c
index 56716f5f767c11646d0edaade51d2b9b4d1b427f..7caa5da9f98eb40071bbc390bef39ab93fc9eaac 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -485,19 +485,13 @@ static int setup_temperature_limits(struct graphics_context *gc, struct plot_inf
 
 static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
 {
-       int deg;
+       double deg;
        const char *unit;
        static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
-       temperature_t temperature = { mkelvin };
 
-       if (output_units.temperature == FAHRENHEIT) {
-               deg = to_F(temperature);
-               unit = UTF8_DEGREE "F";
-       } else {
-               deg = to_C(temperature);
-               unit = UTF8_DEGREE "C";
-       }
-       plot_text(gc, &tro, sec, temperature.mkelvin, "%d%s", deg, unit);
+       deg = get_temp_units(mkelvin, &unit);
+
+       plot_text(gc, &tro, sec, mkelvin, "%d%s", (int)(deg + 0.5), unit);
 }
 
 static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
@@ -617,32 +611,13 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
        plot_pressure_helper(gc, pi, INTERPOLATED_PR);
 }
 
-static int mbar_to_PSI(int mbar)
-{
-       pressure_t p = {mbar};
-       return to_PSI(p);
-}
-
 static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
                                int xalign, int yalign)
 {
        int pressure;
        const char *unit;
 
-       switch (output_units.pressure) {
-       case PASCAL:
-               pressure = mbar * 100;
-               unit = "pascal";
-               break;
-       case BAR:
-               pressure = (mbar + 500) / 1000;
-               unit = "bar";
-               break;
-       case PSI:
-               pressure = mbar_to_PSI(mbar);
-               unit = "psi";
-               break;
-       }
+       pressure = get_pressure_units(mbar, &unit);
        text_render_options_t tro = {10, 0.2, 1.0, 0.2, xalign, yalign};
        plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
@@ -660,7 +635,7 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
                return;
 
        /* only loop over the actual events from the dive computer */
-       for (i = 2; i < pi->nr - 2; i++) {
+       for (i = 2; i < pi->nr; i++) {
                entry = pi->entry + i;
 
                if (!entry->same_cylinder) {
@@ -887,8 +862,10 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
                cur_pr[cyl] = track_pr[cyl]->start;
        }
-       for (i = 0; i < dive->samples; i++) {
-               entry = pi->entry + i + 2;
+
+       /* The first two are "fillers" */
+       for (i = 2; i < pi->nr; i++) {
+               entry = pi->entry + i;
                if (SENSOR_PRESSURE(entry)) {
                        cur_pr[entry->cylinderindex] = SENSOR_PRESSURE(entry);
                } else {
@@ -1000,17 +977,17 @@ static void check_gas_change_events(struct dive *dive, struct plot_info *pi)
  * sides, so that you can do end-points without having to worry
  * about it.
  */
-static struct plot_info *create_plot_info(struct dive *dive)
+static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, struct sample *dive_sample)
 {
        int cylinderindex = -1;
        int lastdepth, lastindex;
-       int i, nr = dive->samples + 4, sec, cyl;
+       int i, nr = nr_samples + 4, sec, cyl;
        size_t alloc_size = plot_info_size(nr);
        struct plot_info *pi;
        pr_track_t *track_pr[MAX_CYLINDERS] = {NULL, };
        pr_track_t *pr_track, *current;
        gboolean missing_pr = FALSE;
-       struct plot_data *entry;
+       struct plot_data *entry = NULL;
 
        pi = malloc(alloc_size);
        if (!pi)
@@ -1020,9 +997,9 @@ static struct plot_info *create_plot_info(struct dive *dive)
        sec = 0;
        lastindex = 0;
        lastdepth = -1;
-       for (i = 0; i < dive->samples; i++) {
+       for (i = 0; i < nr_samples; i++) {
                int depth;
-               struct sample *sample = dive->sample+i;
+               struct sample *sample = dive_sample+i;
 
                entry = pi->entry + i + 2;
                sec = entry->sec = sample->time.seconds;
@@ -1043,8 +1020,8 @@ static struct plot_info *create_plot_info(struct dive *dive)
 
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) /* initialize the start pressures */
                track_pr[cyl] = pr_track_alloc(dive->cylinder[cyl].start.mbar, -1);
-       current = track_pr[dive->sample[0].cylinderindex];
-       for (i = 0; i < dive->samples; i++) {
+       current = track_pr[pi->entry[2].cylinderindex];
+       for (i = 0; i < nr_samples; i++) {
                entry = pi->entry + i + 2;
 
                entry->same_cylinder = entry->cylinderindex == cylinderindex;
@@ -1073,7 +1050,9 @@ static struct plot_info *create_plot_info(struct dive *dive)
                missing_pr |= !SENSOR_PRESSURE(entry);
        }
 
-       current->t_end = entry->sec;
+       if (entry)
+               current->t_end = entry->sec;
+
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) { /* initialize the end pressures */
                int pr = dive->cylinder[cyl].end.mbar;
                if (pr && track_pr[cyl]) {
@@ -1081,10 +1060,8 @@ static struct plot_info *create_plot_info(struct dive *dive)
                        pr_track->end = pr;
                }
        }
-       if (lastdepth)
-               lastindex = i + 2;
        /* Fill in the last two entries with empty values but valid times */
-       i = dive->samples + 2;
+       i = nr_samples + 2;
        pi->entry[i].sec = sec + 20;
        pi->entry[i+1].sec = sec + 40;
        pi->nr = lastindex+1;
@@ -1105,7 +1082,24 @@ static struct plot_info *create_plot_info(struct dive *dive)
 
 void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, struct dive *dive)
 {
-       struct plot_info *pi = create_plot_info(dive);
+       struct plot_info *pi;
+       static struct sample fake[4];
+       struct sample *sample = dive->sample;
+       int nr = dive->samples;
+
+       if (!nr) {
+               int duration = dive->duration.seconds;
+               int maxdepth = dive->maxdepth.mm;
+               sample = fake;
+               fake[1].time.seconds = duration * 0.05;
+               fake[1].depth.mm = maxdepth;
+               fake[2].time.seconds = duration * 0.95;
+               fake[2].depth.mm = maxdepth;
+               fake[3].time.seconds = duration * 1.00;
+               nr = 4;
+       }
+
+       pi = create_plot_info(dive, nr, sample);
 
        cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
        cairo_set_line_width(gc->cr, 2);