X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=1912690ce2b2021fbe25957eff294a086c5c2999;hb=42f627b8b1cf7e929a30c0a07a5fb44a4cec9e1f;hp=1d5b21cbd9c5f250b51f2f04dfbb60460cd7018b;hpb=76af28fee664ee78ff77bf5afd03cdd66b89d78f;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index 1d5b21c..1912690 100644 --- a/profile.c +++ b/profile.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include "dive.h" @@ -23,6 +24,21 @@ struct graphics_context { double scalex, scaley; }; +/* 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 SCALE(gc,x,y) (x)*gc->maxx/gc->scalex,(y)*gc->maxy/gc->scaley @@ -57,11 +73,13 @@ static int round_depth_up(depth_t depth) } typedef struct { + int size; double r,g,b; - enum {CENTER,LEFT} allign; + enum {CENTER,LEFT} halign; + enum {MIDDLE,TOP,BOTTOM} valign; } text_render_options_t; -static void plot_text(struct graphics_context *gc, 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; @@ -74,11 +92,28 @@ static void plot_text(struct graphics_context *gc, 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; - if (tro->allign == CENTER) + switch (tro->halign) { + case CENTER: dx = -(extents.width/2 + extents.x_bearing); - dy = extents.height * 1.2; + 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; + } move_to(gc, x, y); cairo_rel_move_to(cr, dx, dy); @@ -94,63 +129,10 @@ static void plot_text(struct graphics_context *gc, text_render_options_t *tro, 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 struct sample *next_minmax(struct sample *sample, struct sample *end, int minmax) -{ - const int enough = 3000; - struct sample *result; - int timelimit, depthlimit; - - if (sample >= end) - return 0; - - timelimit = 24*60*60; - depthlimit = sample->depth.mm; - result = NULL; - - for (;;) { - int time, depth; - - sample++; - if (sample >= end) - return NULL; - time = sample->time.seconds; - depth = sample->depth.mm; - if (time > timelimit) - break; - - if (minmax) { - if (depth <= depthlimit) { - if (depthlimit - depth > enough) - break; - continue; - } - } else { - if (depth >= depthlimit) { - if (depth - depthlimit > enough) - break; - continue; - } - } - - result = sample; - depthlimit = depth; - /* Look up to ten minutes into the future */ - timelimit = time + 600; - } - return result; -} - -static void render_depth_sample(struct graphics_context *gc, struct sample *sample) +static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro) { - text_render_options_t tro = {1.0, 0.2, 0.2, CENTER}; - int sec = sample->time.seconds; - depth_t depth = sample->depth; + int sec = entry->sec; + depth_t depth = { entry->val }; const char *fmt; double d; @@ -164,32 +146,31 @@ static void render_depth_sample(struct graphics_context *gc, struct sample *samp fmt = "%.0f"; break; } - plot_text(gc, &tro, sec, depth.mm, fmt, d); + plot_text(gc, tro, sec, depth.mm, fmt, d); } -static void plot_text_samples(struct graphics_context *gc, struct sample *a, struct sample *b) +static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi) { - struct sample *max, *min; + 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; - if (b < a) - return; - if (b->time.seconds - a->time.seconds < 3*60) - return; + for (i = 0; i < pi->nr; i++) { + struct plot_data *entry = pi->entry + i; - max = next_minmax(a, b, 1); - if (max) { - render_depth_sample(gc, max); - min = next_minmax(max, b, 0); - if (min) { - plot_text_samples(gc, min, b); - return; - } + if (entry->val < 2000) + continue; + + if (entry == entry->max[2]) + render_depth_sample(gc, entry, &deep); + + if (entry == entry->min[2]) + render_depth_sample(gc, entry, &shallow); } } -static void plot_depth_text(struct dive *dive, struct graphics_context *gc) +static void plot_depth_text(struct dive *dive, struct graphics_context *gc, struct plot_info *pi) { - struct sample *sample, *end; int maxtime, maxdepth; /* Get plot scaling limits */ @@ -199,31 +180,58 @@ static void plot_depth_text(struct dive *dive, struct graphics_context *gc) gc->scalex = maxtime; gc->scaley = maxdepth; - cairo_set_font_size(gc->cr, 14); + plot_text_samples(gc, pi); +} + +static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info *pi) +{ + int i; + struct plot_data *entry = pi->entry; - /* - * We never take the last sample into account. - * It should be a surface event anyway, although - * there are buggy cases where it isn't.. - */ - sample = dive->sample; - end = dive->sample + dive->samples - 1; + 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_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi, + int index, double a) +{ + int i; + struct plot_data *entry = pi->entry; - plot_text_samples(gc, sample, end); + 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); +} + +static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi) +{ + 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); } -static void plot_depth_profile(struct dive *dive, struct graphics_context *gc) +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; - int i, samples; - struct sample *sample; + struct plot_data *entry; int maxtime, maxdepth, marker; - samples = dive->samples; - if (!samples) - return; - cairo_set_line_width(gc->cr, 2); /* Get plot scaling limits */ @@ -261,15 +269,18 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc) gc->scalex = maxtime; - sample = dive->sample; + plot_smoothed_profile(gc, pi); + plot_minmax_profile(gc, pi); + + entry = pi->entry; cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80); - begins = sample->time.seconds; - move_to(gc, sample->time.seconds, sample->depth.mm); - for (i = 1; i < dive->samples; i++) { - sample++; - sec = sample->time.seconds; + 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 = sample->depth.mm; + depth = entry->val; line_to(gc, sec, depth); } } @@ -378,9 +389,9 @@ static double calculate_airuse(struct dive *dive) static void plot_info(struct dive *dive, struct graphics_context *gc) { - text_render_options_t tro = {0.2, 1.0, 0.2, LEFT}; + text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP}; const double liters_per_cuft = 28.317; - const char *unit; + const char *unit, *desc; double airuse; airuse = calculate_airuse(dive); @@ -403,14 +414,21 @@ static void plot_info(struct dive *dive, struct graphics_context *gc) 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; - cairo_set_font_size(gc->cr, 10); - if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) { int start, end; const char *unit = "bar"; @@ -433,16 +451,116 @@ static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_conte break; } - text_render_options_t tro = {0.2, 1.0, 0.2, LEFT}; + 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--; + } + + /* 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) +{ + 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); +} + +static struct plot_info *analyze_plot_info(struct plot_info *pi) +{ + int i; + int nr = pi->nr; + + /* 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; +} + +/* + * 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) +{ + 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); +} + static 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; @@ -462,10 +580,10 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive) plot_cylinder_pressure(dive, gc); /* Depth profile */ - plot_depth_profile(dive, gc); + plot_depth_profile(dive, gc, pi); /* Text on top of all graphs.. */ - plot_depth_text(dive, gc); + plot_depth_text(dive, gc, pi); plot_cylinder_pressure_text(dive, gc); /* And info box in the lower right corner.. */ @@ -509,7 +627,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;