X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=7b3b8833316a2a54a9d8c864b3c5ace804164754;hb=6911229278cda9b59c1ef808c3b2bed7aff64336;hp=a56b7641fc2fefd3e41e33e8c4c3ac35e5fc5ed8;hpb=60a62cf84392233445c8974ef2dc1d2c01307935;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index a56b764..7b3b883 100644 --- a/profile.c +++ b/profile.c @@ -10,7 +10,8 @@ int selected_dive = 0; -/* Plot info with smoothing and one-, two- and three-minute minimums and maximums */ +/* Plot info with smoothing, velocity indication + * and one-, two- and three-minute minimums and maximums */ struct plot_info { int nr; int maxtime; @@ -23,11 +24,23 @@ struct plot_info { /* Depth info */ int val; int smoothed; + enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity; struct plot_data *min[3]; struct plot_data *max[3]; int avg[3]; } entry[]; }; + +/* convert velocity to colors */ +typedef struct { double r, g, b; } rgb_t; +static const rgb_t rgb[] = { + [STABLE] = {0.0, 0.4, 0.0}, + [SLOW] = {0.4, 0.8, 0.0}, + [MODERATE] = {0.8, 0.8, 0.0}, + [FAST] = {0.8, 0.5, 0.0}, + [CRAZY] = {1.0, 0.0, 0.0}, +}; + #define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data)) /* Scale to 0,0 -> maxx,maxy */ @@ -70,31 +83,42 @@ static void set_source_rgb(struct graphics_context *gc, double r, double g, doub * current dive. However, we don't scale past less than * 30 minutes or 90 ft, just so that small dives show * up as such. + * we also need to add 180 seconds at the end so the min/max + * plots correctly */ static int get_maxtime(struct plot_info *pi) { int seconds = pi->maxtime; - return MAX(30*60, ROUND_UP(seconds, 60*10)); + /* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */ + return MAX(30*60, ROUND_UP(seconds+150, 60*5)); } static int get_maxdepth(struct plot_info *pi) { unsigned mm = pi->maxdepth; - /* Minimum 30m */ + /* Minimum 30m, rounded up to 10m, with at least 3m to spare */ return MAX(30000, ROUND_UP(mm+3000, 10000)); } typedef struct { int size; double r,g,b; - enum {CENTER,LEFT} halign; - enum {MIDDLE,TOP,BOTTOM} valign; + double hpos, vpos; } text_render_options_t; +#define RIGHT (-1.0) +#define CENTER (-0.5) +#define LEFT (0.0) + +#define TOP (1) +#define MIDDLE (0) +#define BOTTOM (-1) + 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_font_extents_t fe; cairo_text_extents_t extents; double dx, dy; char buffer[80]; @@ -105,27 +129,10 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t * va_end(args); cairo_set_font_size(cr, tro->size); + cairo_font_extents(cr, &fe); 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; - } + dx = tro->hpos * extents.width + extents.x_bearing; + dy = tro->vpos * extents.height + fe.descent; move_to(gc, x, y); cairo_rel_move_to(cr, dx, dy); @@ -242,7 +249,9 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi { int i; cairo_t *cr = gc->cr; - int begins, sec, depth; + int ends, sec, depth; + int *secs; + int *depths; struct plot_data *entry; int maxtime, maxdepth, marker; @@ -286,29 +295,52 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *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); + secs = (int *) malloc(sizeof(int) * pi->nr); + depths = (int *) malloc(sizeof(int) * pi->nr); + secs[0] = entry->sec; + depths[0] = entry->val; for (i = 1; i < pi->nr; i++) { entry++; sec = entry->sec; - if (sec <= maxtime) { + if (sec <= maxtime || entry->val > 0) { + /* we want to draw the segments in different colors + * representing the vertical velocity, so we need to + * chop this into short segments */ + rgb_t color = rgb[entry->velocity]; depth = entry->val; + set_source_rgb(gc, color.r, color.g, color.b); + move_to(gc, secs[i-1], depths[i-1]); line_to(gc, sec, depth); + cairo_stroke(cr); + ends = i; } + secs[i] = sec; + depths[i] = depth; } + move_to(gc, secs[ends], depths[ends]); gc->topy = 0; gc->bottomy = 1.0; - line_to(gc, MIN(sec,maxtime), 0); - line_to(gc, begins, 0); + line_to(gc, secs[ends], 0); + line_to(gc, secs[0], 0); cairo_close_path(cr); - set_source_rgba(gc, 1, 0.2, 0.2, 0.20); - cairo_fill_preserve(cr); set_source_rgba(gc, 1, 0.2, 0.2, 0.80); cairo_stroke(cr); + /* now do it again for the neat fill */ + gc->topy = 0; gc->bottomy = maxdepth; + set_source_rgba(gc, 1, 0.2, 0.2, 0.20); + move_to(gc, secs[0], depths[0]); + for (i = 1; i <= ends; i++) { + line_to(gc, secs[i],depths[i]); + } + gc->topy = 0; gc->bottomy = 1.0; + line_to(gc, secs[ends], 0); + line_to(gc, secs[0], 0); + cairo_close_path(gc->cr); + cairo_fill(gc->cr); } static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi) { - int maxtime, mintemp, maxtemp; + int maxtime, mintemp, maxtemp, delta; /* Get plot scaling limits */ maxtime = get_maxtime(pi); @@ -316,9 +348,16 @@ static int setup_temperature_limits(struct graphics_context *gc, struct plot_inf maxtemp = pi->maxtemp; 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; + /* Show temperatures in roughly the lower third, but make sure the scale + is at least somewhat reasonable */ + delta = maxtemp - mintemp; + if (delta > 3000) { /* more than 3K in fluctuation */ + gc->topy = maxtemp + delta*2; + gc->bottomy = mintemp - delta/2; + } else { + gc->topy = maxtemp + 1500 + delta*2; + gc->bottomy = mintemp - delta/2; + } return maxtemp > mintemp; } @@ -455,31 +494,43 @@ static double calculate_airuse(struct dive *dive) 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}; + text_render_options_t tro = {10, 0.2, 1.0, 0.2, RIGHT, BOTTOM}; const double liters_per_cuft = 28.317; - const char *unit, *desc; + const char *unit, *format, *desc; double airuse; + char buffer1[80]; + char buffer2[80]; + int len; airuse = calculate_airuse(dive); - if (!airuse) + if (!airuse) { + update_air_info(NULL); return; - - /* I really need to start addign some unit setting thing */ + } switch (output_units.volume) { case LITER: unit = "l"; + format = "vol: %4.0f %s"; break; case CUFT: unit = "cuft"; + format = "vol: %4.2f %s"; airuse /= liters_per_cuft; break; } - plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit); + tro.vpos = -1.0; + plot_text(gc, &tro, 0.98, 0.98, format, airuse, unit); + len = snprintf(buffer1, sizeof(buffer1), format, airuse, unit); + tro.vpos = -2.2; 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); + plot_text(gc, &tro, 0.98, 0.98, "SAC: %4.2f %s/min", sac, unit); + snprintf(buffer1+len, sizeof(buffer1)-len, + "\nSAC: %4.2f %s/min", sac, unit); } + len = 0; + tro.vpos = -3.4; desc = dive->cylinder[0].type.description; if (desc || dive->cylinder[0].gasmix.o2.permille) { int o2 = dive->cylinder[0].gasmix.o2.permille / 10; @@ -487,8 +538,11 @@ static void plot_info(struct dive *dive, struct graphics_context *gc) desc = ""; if (!o2) o2 = 21; - plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2); + plot_text(gc, &tro, 0.98, 0.98, "%s (%d%%)", desc, o2); + len = snprintf(buffer2, sizeof(buffer2), "%s (%d%%): used ", desc, o2); } + snprintf(buffer2+len, sizeof(buffer2)-len, buffer1); + update_air_info(buffer2); } static int mbar_to_PSI(int mbar) @@ -597,12 +651,39 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi) } /* Smoothing function: 5-point triangular smooth */ - for (i = 2; i < nr-2; i++) { + for (i = 2; i < nr-1; 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; + if (i < nr-2) { + val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val; + entry->smoothed = (val+4) / 9; + } + /* vertical velocity in mm/sec */ + if (entry[0].sec - entry[-1].sec) { + val = (entry[0].val - entry[-1].val) / (entry[0].sec - entry[-1].sec); + if (val < -304) /* ascent faster than -60ft/min */ + entry->velocity = CRAZY; + else if (val < -152) /* above -30ft/min */ + entry->velocity = FAST; + else if (val < -76) /* -15ft/min */ + entry->velocity = MODERATE; + else if (val < -25) /* -5ft/min */ + entry->velocity = SLOW; + else if (val < 25) /* very hard to find data, but it appears that the recommendations + for descent are usually about 2x ascent rate; still, we want + stable to mean stable */ + entry->velocity = STABLE; + else if (val < 152) /* between 5 and 30ft/min is considered slow */ + entry->velocity = SLOW; + else if (val < 304) /* up to 60ft/min is moderate */ + entry->velocity = MODERATE; + else if (val < 507) /* up to 100ft/min is fast */ + entry->velocity = FAST; + else /* more than that is just crazy - you'll blow your ears out */ + entry->velocity = CRAZY; + } else + entry->velocity = STABLE; } /* One-, two- and three-minute minmax data */