X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=5ac8a01c58eec937aeac3ffdf5beebefa7c2894a;hb=3b67a3ecb4193972a87c5c25b29a4279121d4366;hp=5ddc43d30442c2e9f60c1e0824e7237312597046;hpb=c1bed52a777fb8d03e056afddf7879af7b94d157;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index 5ddc43d..5ac8a01 100644 --- a/profile.c +++ b/profile.c @@ -1,9 +1,11 @@ #include #include +#include #include #include "dive.h" #include "display.h" +#include "divelist.h" int selected_dive = 0; @@ -25,6 +27,70 @@ static int round_feet_up(int feet) return MAX(90, ROUND_UP(feet+5, 15)); } +static void plot_text(cairo_t *cr, double x, double y, const char *fmt, ...) +{ + cairo_text_extents_t extents; + char buffer[80]; + va_list args; + + va_start(args, fmt); + vsnprintf(buffer, sizeof(buffer), fmt, args); + va_end(args); + + cairo_text_extents(cr, buffer, &extents); + + x -= extents.width/2 + extents.x_bearing; + y += extents.height * 1.2; + + cairo_move_to(cr, x, y); + cairo_text_path(cr, buffer); + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_stroke(cr); + + cairo_move_to(cr, x, y); + cairo_set_source_rgb(cr, 1, 0, 0); + cairo_show_text(cr, buffer); +} + +/* Find the next maximum point in a 5-minute window */ +static int next_minmax(struct dive *dive, int index, int max) +{ + int timelimit, depthlimit, result; + struct sample *sample = dive->sample + index; + + if (index >= dive->samples) + return 0; + + timelimit = 24*60*60; + depthlimit = sample->depth.mm; + result = 0; + + for (;;) { + int time, depth; + + index++; + sample++; + if (index >= dive->samples) + break; + time = sample->time.seconds; + depth = sample->depth.mm; + if (time > timelimit) + break; + if (max) { + if (depth <= depthlimit) + continue; + } else { + if (depth >= depthlimit) + continue; + } + + depthlimit = depth; + timelimit = time + 300; + result = index; + } + return result; +} + /* Scale to 0,0 -> maxx,maxy */ #define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy @@ -35,7 +101,7 @@ static void plot_profile(struct dive *dive, cairo_t *cr, int begins, sec, depth; int i, samples; struct sample *sample; - int maxtime, maxdepth; + int maxtime, maxdepth, mindepth; samples = dive->samples; if (!samples) @@ -91,9 +157,27 @@ static void plot_profile(struct dive *dive, cairo_t *cr, cairo_fill_preserve(cr); cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80); cairo_stroke(cr); + + scalex = maxtime; + scaley = maxdepth; + + maxdepth = mindepth = 0; + maxtime = 0; + 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) { + sample = dive->sample+i; + sec = sample->time.seconds; + depth = to_feet(sample->depth); + plot_text(cr, SCALE(sec, depth), "%d ft", depth); + i = next_minmax(dive, i, 0); + if (!i) + break; + } } -static int get_tank_pressure_range(struct dive *dive, double *scalex, double *scaley) +static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley) { int i; double min, max; @@ -106,9 +190,12 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc struct sample *sample = dive->sample + i; double bar; - if (!sample->tankpressure.mbar) + /* FIXME! We only track cylinder 0 right now */ + if (sample->cylinderindex) + continue; + if (!sample->cylinderpressure.mbar) continue; - bar = sample->tankpressure.mbar; + bar = sample->cylinderpressure.mbar; if (bar < min) min = bar; if (bar > max) @@ -120,29 +207,34 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc return 1; } -static void plot_tank_pressure(struct dive *dive, cairo_t *cr, +static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr, double topx, double topy, double maxx, double maxy) { - int i; + int i, sec = -1; double scalex, scaley; - if (!get_tank_pressure_range(dive, &scalex, &scaley)) + if (!get_cylinder_pressure_range(dive, &scalex, &scaley)) return; 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; + int mbar; struct sample *sample = dive->sample + i; - sec = sample->time.seconds; - mbar = sample->tankpressure.mbar; + mbar = sample->cylinderpressure.mbar; if (!mbar) continue; + sec = sample->time.seconds; cairo_line_to(cr, SCALE(sec, mbar)); } - cairo_line_to(cr, SCALE(dive->duration.seconds, dive->end_pressure.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); } @@ -159,8 +251,8 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive) /* Depth profile */ plot_profile(dive, cr, topx, topy, maxx, maxy); - /* Tank pressure plot? */ - plot_tank_pressure(dive, cr, topx, topy, maxx, maxy); + /* Cylinder pressure plot? */ + plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy); /* Bounding box last */ scalex = scaley = 1.0; @@ -195,17 +287,13 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer return FALSE; } -GtkWidget *dive_profile_frame(void) +GtkWidget *dive_profile_widget(void) { - GtkWidget *frame; GtkWidget *da; - frame = gtk_frame_new("Dive profile"); - gtk_widget_show(frame); da = gtk_drawing_area_new(); gtk_widget_set_size_request(da, 450, 350); g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL); - gtk_container_add(GTK_CONTAINER(frame), da); - return frame; + return da; }