]> git.tdb.fi Git - ext/subsurface.git/blobdiff - profile.c
Print the end temperature of the dive
[ext/subsurface.git] / profile.c
index f0a4c7030f68f77044996520d40ddf9df02cae2b..fdbbcdf165fe1746b3dbc85aeb7afe35a788ee09 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <time.h>
 
 #include "dive.h"
@@ -9,6 +10,54 @@
 
 int selected_dive = 0;
 
+/* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
+struct plot_info {
+       int nr;
+       int maxtime;
+       struct plot_data {
+               int sec;
+               int val;
+               int smoothed;
+               struct plot_data *min[3];
+               struct plot_data *max[3];
+               int avg[3];
+       } entry[];
+};
+#define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
+
+/* Scale to 0,0 -> maxx,maxy */
+#define SCALEX(gc,x)  (((x)-gc->leftx)/(gc->rightx-gc->leftx)*gc->maxx)
+#define SCALEY(gc,y)  (((y)-gc->topy)/(gc->bottomy-gc->topy)*gc->maxy)
+#define SCALE(gc,x,y) SCALEX(gc,x),SCALEY(gc,y)
+
+static void move_to(struct graphics_context *gc, double x, double y)
+{
+       cairo_move_to(gc->cr, SCALE(gc, x, y));
+}
+
+static void line_to(struct graphics_context *gc, double x, double y)
+{
+       cairo_line_to(gc->cr, SCALE(gc, x, y));
+}
+
+static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
+{
+       if (gc->printer) {
+               /* Black is white and white is black */
+               double sum = r+g+b;
+               if (sum > 2)
+                       r = g = b = 0;
+               else if (sum < 1)
+                       r = g = b = 1;
+       }
+       cairo_set_source_rgba(gc->cr, r, g, b, a);
+}
+
+static void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
+{
+       set_source_rgba(gc, r, g, b, 1);
+}
+
 #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
 
 /*
@@ -22,20 +71,26 @@ static int round_seconds_up(int seconds)
        return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
-static int round_feet_up(int feet)
+static int round_depth_up(depth_t depth)
 {
-       return MAX(90, ROUND_UP(feet+5, 15));
+       unsigned mm = depth.mm;
+       /* Minimum 30m */
+       return MAX(30000, ROUND_UP(mm+3000, 10000));
 }
 
 typedef struct {
-    double r,g,b;
-    enum {CENTER,LEFT} allign;
+       int size;
+       double r,g,b;
+       enum {CENTER,LEFT} halign;
+       enum {MIDDLE,TOP,BOTTOM} valign;
 } text_render_options_t;
 
-static void plot_text(cairo_t *cr, text_render_options_t *tro,
+static void plot_text(struct graphics_context *gc, const text_render_options_t *tro,
                      double x, double y, const char *fmt, ...)
 {
+       cairo_t *cr = gc->cr;
        cairo_text_extents_t extents;
+       double dx, dy;
        char buffer[80];
        va_list args;
 
@@ -43,224 +98,361 @@ static void plot_text(cairo_t *cr, text_render_options_t *tro,
        vsnprintf(buffer, sizeof(buffer), fmt, args);
        va_end(args);
 
+       cairo_set_font_size(cr, tro->size);
        cairo_text_extents(cr, buffer, &extents);
+       dx = 0;
+       switch (tro->halign) {
+       case CENTER:
+               dx = -(extents.width/2 + extents.x_bearing);
+               break;
+       case LEFT:
+               dx = 0;
+               break;
+       }
+       switch (tro->valign) {
+       case TOP:
+               dy = extents.height * 1.2;
+               break;
+       case BOTTOM:
+               dy = -extents.height * 0.8;
+               break;
+       case MIDDLE:
+               dy = 0;
+               break;
+       }
 
-       if (tro->allign == CENTER)
-           x -= extents.width/2 + extents.x_bearing;
-       y += extents.height * 1.2;
+       move_to(gc, x, y);
+       cairo_rel_move_to(cr, dx, dy);
 
-       cairo_move_to(cr, x, y);
        cairo_text_path(cr, buffer);
-       cairo_set_source_rgb(cr, 0, 0, 0);
+       set_source_rgb(gc, 0, 0, 0);
        cairo_stroke(cr);
 
-       cairo_move_to(cr, x, y);
-       cairo_set_source_rgb(cr, tro->r, tro->g, tro->b);
+       move_to(gc, x, y);
+       cairo_rel_move_to(cr, dx, dy);
+
+       set_source_rgb(gc, tro->r, tro->g, tro->b);
        cairo_show_text(cr, buffer);
 }
 
-/*
- * Find the next maximum point in a 10-minute window.
- *
- * We exit early if we hit "enough" of a depth reversal,
- * which is roughly 10 feet.
- */
-static int next_minmax(struct dive *dive, int index, int minmax)
+static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro)
 {
-       const int enough = 3000;
-       int timelimit, depthlimit, result;
-       struct sample *sample = dive->sample + index;
-
-       if (index >= dive->samples)
-               return 0;
+       int sec = entry->sec;
+       depth_t depth = { entry->val };
+       const char *fmt;
+       double d;
+
+       switch (output_units.length) {
+       case METERS:
+               d = depth.mm / 1000.0;
+               fmt = "%.1f";
+               break;
+       case FEET:
+               d = to_feet(depth);
+               fmt = "%.0f";
+               break;
+       }
+       plot_text(gc, tro, sec, depth.mm, fmt, d);
+}
 
-       timelimit = 24*60*60;
-       depthlimit = sample->depth.mm;
-       result = 0;
+static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
+{
+       static const text_render_options_t deep = {14, 1.0, 0.2, 0.2, CENTER, TOP};
+       static const text_render_options_t shallow = {14, 1.0, 0.2, 0.2, CENTER, BOTTOM};
+       int i;
 
-       for (;;) {
-               int time, depth;
+       for (i = 0; i < pi->nr; i++) {
+               struct plot_data *entry = pi->entry + i;
 
-               index++;
-               sample++;
-               if (index >= dive->samples)
-                       break;
-               time = sample->time.seconds;
-               depth = sample->depth.mm;
-               if (time > timelimit)
-                       break;
+               if (entry->val < 2000)
+                       continue;
 
-               if (minmax) {
-                       if (depth <= depthlimit) {
-                               if (depthlimit - depth > enough)
-                                       break;
-                               continue;
-                       }
-               } else {
-                       if (depth >= depthlimit) {
-                               if (depth - depthlimit > enough)
-                                       break;
-                               continue;
-                       }
-               }
+               if (entry == entry->max[2])
+                       render_depth_sample(gc, entry, &deep);
 
-               result = index;
-               depthlimit = depth;
-               /* Look up to ten minutes into the future */
-               timelimit = time + 600;
+               if (entry == entry->min[2])
+                       render_depth_sample(gc, entry, &shallow);
        }
-       return result;
 }
 
-/* Scale to 0,0 -> maxx,maxy */
-#define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy
-
-static void plot_depth_text(struct dive *dive, cairo_t *cr,
-       double topx, double topy, double maxx, double maxy)
+static void plot_depth_text(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
 {
-       double scalex, scaley;
        int maxtime, maxdepth;
-       int i;
 
        /* Get plot scaling limits */
        maxtime = round_seconds_up(dive->duration.seconds);
-       maxdepth = round_feet_up(to_feet(dive->maxdepth));
+       maxdepth = round_depth_up(dive->maxdepth);
 
-       scalex = maxtime;
-       scaley = maxdepth;
+       gc->leftx = 0; gc->rightx = maxtime;
+       gc->topy = 0; gc->bottomy = maxdepth;
 
-       cairo_set_font_size(cr, 14);
-       cairo_set_source_rgb(cr, 1, 0.2, 0.2);
-       i = 0;
-       while ((i = next_minmax(dive, i, 1)) != 0) {
-               text_render_options_t tro = {1.0, 0.2, 0.2, CENTER};
-               struct sample *sample = dive->sample+i;
-               int sec = sample->time.seconds;
-               int depth = to_feet(sample->depth);
+       plot_text_samples(gc, pi);
+}
 
-               plot_text(cr, &tro, SCALE(sec, depth), "%d ft", depth);
-               i = next_minmax(dive, i, 0);
-               if (!i)
-                       break;
+static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info *pi)
+{
+       int i;
+       struct plot_data *entry = pi->entry;
+
+       cairo_set_source_rgba(gc->cr, 1, 0.2, 0.2, 0.20);
+       move_to(gc, entry->sec, entry->smoothed);
+       for (i = 1; i < pi->nr; i++) {
+               entry++;
+               line_to(gc, entry->sec, entry->smoothed);
        }
+       cairo_stroke(gc->cr);
 }
 
-static void plot_depth_profile(struct dive *dive, cairo_t *cr,
-       double topx, double topy, double maxx, double maxy)
+static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi,
+                               int index, double a)
 {
-       double scalex, scaley;
-       int begins, sec, depth;
-       int i, samples;
-       struct sample *sample;
-       int maxtime, maxdepth;
+       int i;
+       struct plot_data *entry = pi->entry;
+
+       cairo_set_source_rgba(gc->cr, 1, 0.2, 1, a);
+       move_to(gc, entry->sec, entry->min[index]->val);
+       for (i = 1; i < pi->nr; i++) {
+               entry++;
+               line_to(gc, entry->sec, entry->min[index]->val);
+       }
+       for (i = 1; i < pi->nr; i++) {
+               line_to(gc, entry->sec, entry->max[index]->val);
+               entry--;
+       }
+       cairo_close_path(gc->cr);
+       cairo_fill(gc->cr);
+}
 
-       samples = dive->samples;
-       if (!samples)
+static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
+{
+       if (gc->printer)
                return;
+       plot_minmax_profile_minute(gc, pi, 2, 0.1);
+       plot_minmax_profile_minute(gc, pi, 1, 0.1);
+       plot_minmax_profile_minute(gc, pi, 0, 0.1);
+}
 
-       cairo_set_line_width(cr, 2);
+static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
+{
+       int i;
+       cairo_t *cr = gc->cr;
+       int begins, sec, depth;
+       struct plot_data *entry;
+       int maxtime, maxdepth, marker;
 
        /* Get plot scaling limits */
        maxtime = round_seconds_up(dive->duration.seconds);
-       maxdepth = round_feet_up(to_feet(dive->maxdepth));
+       maxdepth = round_depth_up(dive->maxdepth);
 
        /* Time markers: every 5 min */
-       scalex = maxtime;
-       scaley = 1.0;
+       gc->leftx = 0; gc->rightx = maxtime;
+       gc->topy = 0; gc->bottomy = 1.0;
        for (i = 5*60; i < maxtime; i += 5*60) {
-               cairo_move_to(cr, SCALE(i, 0));
-               cairo_line_to(cr, SCALE(i, 1));
+               move_to(gc, i, 0);
+               line_to(gc, i, 1);
        }
 
-       /* Depth markers: every 15 ft */
-       scalex = 1.0;
-       scaley = maxdepth;
-       cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
-       for (i = 15; i < maxdepth; i += 15) {
-               cairo_move_to(cr, SCALE(0, i));
-               cairo_line_to(cr, SCALE(1, i));
+       /* Depth markers: every 30 ft or 10 m*/
+       gc->leftx = 0; gc->rightx = 1.0;
+       gc->topy = 0; gc->bottomy = maxdepth;
+       switch (output_units.length) {
+       case METERS: marker = 10000; break;
+       case FEET: marker = 9144; break;        /* 30 ft */
+       }
+
+       set_source_rgba(gc, 1, 1, 1, 0.5);
+       for (i = marker; i < maxdepth; i += marker) {
+               move_to(gc, 0, i);
+               line_to(gc, 1, i);
        }
        cairo_stroke(cr);
 
        /* Show mean depth */
-       cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
-       cairo_move_to(cr, SCALE(0, to_feet(dive->meandepth)));
-       cairo_line_to(cr, SCALE(1, to_feet(dive->meandepth)));
+       set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
+       move_to(gc, 0, dive->meandepth.mm);
+       line_to(gc, 1, dive->meandepth.mm);
        cairo_stroke(cr);
 
-       scalex = maxtime;
-
-       sample = dive->sample;
-       cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
-       begins = sample->time.seconds;
-       cairo_move_to(cr, SCALE(sample->time.seconds, to_feet(sample->depth)));
-       for (i = 1; i < dive->samples; i++) {
-               sample++;
-               sec = sample->time.seconds;
-               depth = to_feet(sample->depth);
-               cairo_line_to(cr, SCALE(sec, depth));
+       gc->leftx = 0; gc->rightx = maxtime;
+
+       plot_smoothed_profile(gc, pi);
+       plot_minmax_profile(gc, pi);
+
+       entry = pi->entry;
+       set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
+       begins = entry->sec;
+       move_to(gc, entry->sec, entry->val);
+       for (i = 1; i < pi->nr; i++) {
+               entry++;
+               sec = entry->sec;
+               if (sec <= maxtime) {
+                       depth = entry->val;
+                       line_to(gc, sec, depth);
+               }
        }
-       scaley = 1.0;
-       cairo_line_to(cr, SCALE(sec, 0));
-       cairo_line_to(cr, SCALE(begins, 0));
+       gc->topy = 0; gc->bottomy = 1.0;
+       line_to(gc, MIN(sec,maxtime), 0);
+       line_to(gc, begins, 0);
        cairo_close_path(cr);
-       cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
+       set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
        cairo_fill_preserve(cr);
-       cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
+       set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
+       cairo_stroke(cr);
+}
+
+static int setup_temperature_limits(struct dive *dive, struct graphics_context *gc)
+{
+       int i;
+       int maxtime, mintemp, maxtemp;
+
+       /* Get plot scaling limits */
+       maxtime = round_seconds_up(dive->duration.seconds);
+       mintemp = INT_MAX;
+       maxtemp = 0;
+       for (i = 0; i < dive->samples; i++) {
+               struct sample *sample = dive->sample+i;
+               int mkelvin = sample->temperature.mkelvin;
+               if (!mkelvin)
+                       continue;
+               if (mkelvin > maxtemp)
+                       maxtemp = mkelvin;
+               if (mkelvin < mintemp)
+                       mintemp = mkelvin;
+       }
+
+       gc->leftx = 0; gc->rightx = maxtime;
+       /* Show temperatures in roughly the lower third */
+       gc->topy = maxtemp + (maxtemp - mintemp)*2;
+       gc->bottomy = mintemp - (maxtemp - mintemp)/2;
+
+       return maxtemp > mintemp;
+}
+
+static void plot_single_temp_text(struct graphics_context *gc, int sec, temperature_t temperature)
+{
+       int deg;
+       const char *unit;
+       static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
+
+       if (output_units.temperature == FAHRENHEIT) {
+               deg = to_F(temperature);
+               unit = "F";
+       } else {
+               deg = to_C(temperature);
+               unit = "C";
+       }
+       plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+}
+
+static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+{
+       int i;
+       int last = 0;
+       temperature_t last_temperature, last_printed_temp;
+
+       if (!setup_temperature_limits(dive, gc))
+               return;
+
+       for (i = 0; i < dive->samples; i++) {
+               struct sample *sample = dive->sample+i;
+               if (sample->time.seconds > dive->duration.seconds)
+                       break; /* let's not plot surface temp events */
+               int mkelvin = sample->temperature.mkelvin;
+               int sec;
+               if (!mkelvin)
+                       continue;
+               last_temperature = sample->temperature;
+               sec = sample->time.seconds;
+               if (sec < last)
+                       continue;
+               last = sec + 300;
+               plot_single_temp_text(gc,sec,sample->temperature);
+               last_printed_temp = last_temperature ;
+       }
+       /* it would be nice to print the end temperature, if it's different */
+       if (last_temperature.mkelvin != last_printed_temp.mkelvin) {
+               plot_single_temp_text(gc,dive->duration.seconds,last_temperature);
+       }
+}
+
+static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc)
+{
+       int i;
+       cairo_t *cr = gc->cr;
+       int last = 0;
+
+       if (!setup_temperature_limits(dive, gc))
+               return;
+
+       set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
+       for (i = 0; i < dive->samples; i++) {
+               struct sample *sample = dive->sample+i;
+               if (sample->time.seconds > dive->duration.seconds)
+                       break; /* let's not plot surface temp events */
+               int mkelvin = sample->temperature.mkelvin;
+               if (!mkelvin) {
+                       if (!last)
+                               continue;
+                       mkelvin = last;
+               }
+               if (last)
+                       line_to(gc, sample->time.seconds, mkelvin);
+               else
+                       move_to(gc, sample->time.seconds, mkelvin);
+               last = mkelvin;
+       }
        cairo_stroke(cr);
 }
 
 /* gets both the actual start and end pressure as well as the scaling factors */
-static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley,
-                                      double *startp, double *endp)
+static int get_cylinder_pressure_range(struct dive *dive, struct graphics_context *gc,
+       pressure_t *startp, pressure_t *endp)
 {
        int i;
-       double min, max;
-       double bar;
+       int min, max;
 
-       *scalex = round_seconds_up(dive->duration.seconds);
+       gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
 
        max = 0;
-       min = 5000;
+       min = 5000000;
        if (startp)
-           *startp = *endp = 0.0;
+               startp->mbar = endp->mbar = 0;
 
        for (i = 0; i < dive->samples; i++) {
+               int mbar;
                struct sample *sample = dive->sample + i;
 
                /* FIXME! We only track cylinder 0 right now */
                if (sample->cylinderindex)
                        continue;
-               if (!sample->cylinderpressure.mbar)
+               mbar = sample->cylinderpressure.mbar;
+               if (!mbar)
                        continue;
-               bar = sample->cylinderpressure.mbar;
-               if (bar != 0.0 && startp && *startp == 0.0)
-                   *startp = bar;
-               if (bar < min)
-                       min = bar;
-               if (bar > max)
-                       max = bar;
+               if (mbar < min)
+                       min = mbar;
+               if (mbar > max)
+                       max = mbar;
        }
+       if (startp)
+               startp->mbar = max;
        if (endp)
-           *endp = bar;
+               endp->mbar = min;
        if (!max)
                return 0;
-       *scaley = max * 1.5;
+       gc->topy = 0; gc->bottomy = max * 1.5;
        return 1;
 }
 
-static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
-       double topx, double topy, double maxx, double maxy)
+static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc)
 {
        int i, sec = -1;
-       double scalex, scaley;
 
-       if (!get_cylinder_pressure_range(dive, &scalex, &scaley, NULL, NULL))
+       if (!get_cylinder_pressure_range(dive, gc, NULL, NULL))
                return;
 
-       cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
+       cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
 
-       cairo_move_to(cr, SCALE(0, dive->cylinder[0].start.mbar));
+       move_to(gc, 0, dive->cylinder[0].start.mbar);
        for (i = 1; i < dive->samples; i++) {
                int mbar;
                struct sample *sample = dive->sample + i;
@@ -269,84 +461,281 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
                if (!mbar)
                        continue;
                sec = sample->time.seconds;
-               cairo_line_to(cr, SCALE(sec, mbar));
+               if (sec <= dive->duration.seconds)
+                       line_to(gc, sec, mbar);
        }
        /*
         * We may have "surface time" events, in which case we don't go
         * back to dive duration
         */
        if (sec < dive->duration.seconds)
-               cairo_line_to(cr, SCALE(dive->duration.seconds, dive->cylinder[0].end.mbar));
-       cairo_stroke(cr);
+               line_to(gc, dive->duration.seconds, dive->cylinder[0].end.mbar);
+       cairo_stroke(gc->cr);
+}
+
+/*
+ * Return air usage (in liters).
+ */
+static double calculate_airuse(struct dive *dive)
+{
+       double airuse = 0;
+       int i;
+
+       for (i = 0; i < MAX_CYLINDERS; i++) {
+               cylinder_t *cyl = dive->cylinder + i;
+               int size = cyl->type.size.mliter;
+               double kilo_atm;
+
+               if (!size)
+                       continue;
+
+               kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+
+               /* Liters of air at 1 atm == milliliters at 1k atm*/
+               airuse += kilo_atm * size;
+       }
+       return airuse;
+}
+
+static void plot_info(struct dive *dive, struct graphics_context *gc)
+{
+       text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
+       const double liters_per_cuft = 28.317;
+       const char *unit, *desc;
+       double airuse;
+
+       airuse = calculate_airuse(dive);
+       if (!airuse)
+               return;
+
+       /* I really need to start addign some unit setting thing */
+       switch (output_units.volume) {
+       case LITER:
+               unit = "l";
+               break;
+       case CUFT:
+               unit = "cuft";
+               airuse /= liters_per_cuft;
+               break;
+       }
+       plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit);
+       if (dive->duration.seconds) {
+               double pressure = 1 + (dive->meandepth.mm / 10000.0);
+               double sac = airuse / pressure * 60 / dive->duration.seconds;
+               plot_text(gc, &tro, 0.8, 0.85, "SAC: %4.2f %s/min", sac, unit);
+       }
+       desc = dive->cylinder[0].type.description;
+       if (desc || dive->cylinder[0].gasmix.o2.permille) {
+               int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
+               if (!desc)
+                       desc = "";
+               if (!o2)
+                       o2 = 21;
+               plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
+       }
+}
+
+static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
+{
+       pressure_t startp, endp;
+
+       if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) {
+               int start, end;
+               const char *unit = "bar";
+
+               switch (output_units.pressure) {
+               case PASCAL:
+                       start = startp.mbar * 100;
+                       end = startp.mbar * 100;
+                       unit = "pascal";
+                       break;
+               case BAR:
+                       start = (startp.mbar + 500) / 1000;
+                       end = (endp.mbar + 500) / 1000;
+                       unit = "bar";
+                       break;
+               case PSI:
+                       start = to_PSI(startp);
+                       end = to_PSI(endp);
+                       unit = "psi";
+                       break;
+               }
+
+               text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
+               plot_text(gc, &tro, 0, startp.mbar, "%d %s", start, unit);
+               plot_text(gc, &tro, dive->duration.seconds, endp.mbar,
+                         "%d %s", end, unit);
+       }
 }
 
+static void analyze_plot_info_minmax_minute(struct plot_data *entry, struct plot_data *first, struct plot_data *last, int index)
+{
+       struct plot_data *p = entry;
+       int time = entry->sec;
+       int seconds = 90*(index+1);
+       struct plot_data *min, *max;
+       int avg, nr;
+
+       /* Go back 'seconds' in time */
+       while (p > first) {
+               if (p[-1].sec < time - seconds)
+                       break;
+               p--;
+       }
 
-static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
-       double topx, double topy, double maxx, double maxy)
+       /* Then go forward until we hit an entry past the time */
+       min = max = p;
+       avg = p->val;
+       nr = 1;
+       while (++p < last) {
+               int val = p->val;
+               if (p->sec > time + seconds)
+                       break;
+               avg += val;
+               nr ++;
+               if (val < min->val)
+                       min = p;
+               if (val > max->val)
+                       max = p;
+       }
+       entry->min[index] = min;
+       entry->max[index] = max;
+       entry->avg[index] = (avg + nr/2) / nr;
+}
+
+static void analyze_plot_info_minmax(struct plot_data *entry, struct plot_data *first, struct plot_data *last)
 {
-       double scalex, scaley;
-       double startp,endp;
+       analyze_plot_info_minmax_minute(entry, first, last, 0);
+       analyze_plot_info_minmax_minute(entry, first, last, 1);
+       analyze_plot_info_minmax_minute(entry, first, last, 2);
+}
 
-       cairo_set_font_size(cr, 10);
+static struct plot_info *analyze_plot_info(struct plot_info *pi)
+{
+       int i;
+       int nr = pi->nr;
 
-       if (get_cylinder_pressure_range(dive, &scalex, &scaley,
-                                       &startp, &endp)) {
-               text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
-               plot_text(cr, &tro, SCALE(0, startp), "%3.0f bar", startp/1000.0);
-               plot_text(cr, &tro, SCALE(dive->duration.seconds, endp),
-                         "%3.0f bar", endp/1000.0);
+       /* Smoothing function: 5-point triangular smooth */
+       for (i = 2; i < nr-2; i++) {
+               struct plot_data *entry = pi->entry+i;
+               int val;
+
+               val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val;
+               entry->smoothed = (val+4) / 9;
+       }
+
+       /* One-, two- and three-minute minmax data */
+       for (i = 0; i < nr; i++) {
+               struct plot_data *entry = pi->entry +i;
+               analyze_plot_info_minmax(entry, pi->entry, pi->entry+nr);
        }
+       
+       return pi;
 }
 
-static void plot(cairo_t *cr, int w, int h, struct dive *dive)
+/*
+ * Create a plot-info with smoothing and ranged min/max
+ *
+ * This also makes sure that we have extra empty events on both
+ * sides, so that you can do end-points without having to worry
+ * about it.
+ */
+static struct plot_info *depth_plot_info(struct dive *dive)
 {
-       double topx, topy, maxx, maxy;
-       double scalex, scaley;
+       int i, nr = dive->samples + 4, sec;
+       size_t alloc_size = plot_info_size(nr);
+       struct plot_info *pi;
+
+       pi = malloc(alloc_size);
+       if (!pi)
+               return pi;
+       memset(pi, 0, alloc_size);
+       pi->nr = nr;
+       sec = 0;
+       for (i = 0; i < dive->samples; i++) {
+               struct sample *sample = dive->sample+i;
+               struct plot_data *entry = pi->entry + i + 2;
+
+               sec = entry->sec = sample->time.seconds;
+               entry->val = sample->depth.mm;
+       }
+       /* Fill in the last two entries with empty values but valid times */
+       i = dive->samples + 2;
+       pi->entry[i].sec = sec + 20;
+       pi->entry[i+1].sec = sec + 40;
+
+       return analyze_plot_info(pi);
+}
+
+void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
+{
+       double topx, topy;
+       struct plot_info *pi = depth_plot_info(dive);
 
        topx = w / 20.0;
        topy = h / 20.0;
-       maxx = (w - 2*topx);
-       maxy = (h - 2*topy);
+       cairo_translate(gc->cr, topx, topy);
+       cairo_set_line_width(gc->cr, 2);
+       cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
+       cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
+
+       /*
+        * We can use "cairo_translate()" because that doesn't
+        * scale line width etc. But the actual scaling we need
+        * do set up ourselves..
+        *
+        * Snif. What a pity.
+        */
+       gc->maxx = (w - 2*topx);
+       gc->maxy = (h - 2*topy);
+
+       /* Temperature profile */
+       plot_temperature_profile(dive, gc);
 
        /* Cylinder pressure plot */
-       plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
+       plot_cylinder_pressure(dive, gc);
 
        /* Depth profile */
-       plot_depth_profile(dive, cr, topx, topy, maxx, maxy);
+       plot_depth_profile(dive, gc, pi);
 
        /* Text on top of all graphs.. */
-       plot_depth_text(dive, cr, topx, topy, maxx, maxy);
-       plot_cylinder_pressure_text(dive, cr, topx, topy, maxx, maxy);
+       plot_temperature_text(dive, gc);
+       plot_depth_text(dive, gc, pi);
+       plot_cylinder_pressure_text(dive, gc);
+
+       /* And info box in the lower right corner.. */
+       gc->leftx = 0; gc->rightx = 1.0;
+       gc->topy = 0; gc->bottomy = 1.0;
+       plot_info(dive, gc);
 
        /* Bounding box last */
-       scalex = scaley = 1.0;
-       cairo_set_source_rgb(cr, 1, 1, 1);
-       cairo_move_to(cr, SCALE(0,0));
-       cairo_line_to(cr, SCALE(0,1));
-       cairo_line_to(cr, SCALE(1,1));
-       cairo_line_to(cr, SCALE(1,0));
-       cairo_close_path(cr);
-       cairo_stroke(cr);
+       set_source_rgb(gc, 1, 1, 1);
+       move_to(gc, 0, 0);
+       line_to(gc, 0, 1);
+       line_to(gc, 1, 1);
+       line_to(gc, 1, 0);
+       cairo_close_path(gc->cr);
+       cairo_stroke(gc->cr);
 
 }
 
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
        struct dive *dive = current_dive;
-       cairo_t *cr;
+       struct graphics_context gc = { .printer = 0 };
        int w,h;
 
        w = widget->allocation.width;
        h = widget->allocation.height;
 
-       cr = gdk_cairo_create(widget->window);
-       cairo_set_source_rgb(cr, 0, 0, 0);
-       cairo_paint(cr);
+       gc.cr = gdk_cairo_create(widget->window);
+       set_source_rgb(&gc, 0, 0, 0);
+       cairo_paint(gc.cr);
 
        if (dive)
-               plot(cr, w, h, dive);
+               plot(&gc, w, h, dive);
 
-       cairo_destroy(cr);
+       cairo_destroy(gc.cr);
 
        return FALSE;
 }
@@ -356,7 +745,7 @@ GtkWidget *dive_profile_widget(void)
        GtkWidget *da;
 
        da = gtk_drawing_area_new();
-       gtk_widget_set_size_request(da, 450, 350);
+       gtk_widget_set_size_request(da, 350, 250);
        g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
 
        return da;