X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=47e12ba66352421b6cc36790ba1b293f43edf52f;hb=855df669d9aa3a30a8a5db708a63ee9991968bab;hp=88e86941b40a0082788f74a1562b6b3449f7503f;hpb=160745c545c05f4b25a3c042aa770e8213b763a2;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index 88e8694..47e12ba 100644 --- a/profile.c +++ b/profile.c @@ -48,7 +48,7 @@ struct plot_info { /* convert velocity to colors */ typedef struct { double r, g, b; } rgb_t; -static const rgb_t rgb[] = { +static const rgb_t velocity_color[] = { [STABLE] = {0.0, 0.4, 0.0}, [SLOW] = {0.4, 0.8, 0.0}, [MODERATE] = {0.8, 0.8, 0.0}, @@ -89,6 +89,11 @@ static void set_source_rgba(struct graphics_context *gc, double r, double g, dou cairo_set_source_rgba(gc->cr, r, g, b, a); } +static void set_source_rgb_struct(struct graphics_context *gc, const rgb_t *rgb) +{ + set_source_rgba(gc, rgb->r, rgb->g, rgb->b, 1); +} + void set_source_rgb(struct graphics_context *gc, double r, double g, double b) { set_source_rgba(gc, r, g, b, 1); @@ -476,9 +481,8 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi /* 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->depth; - set_source_rgb(gc, color.r, color.g, color.b); + set_source_rgb_struct(gc, &velocity_color[entry->velocity]); move_to(gc, entry[-1].sec, entry[-1].depth); line_to(gc, sec, depth); cairo_stroke(cr); @@ -595,36 +599,44 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_ return pi->maxpressure != 0; } -/* set the color for the pressure plot according to temporary sac rate */ -static void set_sac_color(struct graphics_context *gc, double sac) +#define SAC_COLORS 9 +static const rgb_t sac_color[SAC_COLORS] = { + { 0.0, 0.4, 0.2}, + { 0.2, 0.6, 0.2}, + { 0.4, 0.8, 0.2}, + { 0.6, 0.8, 0.2}, + { 0.8, 0.8, 0.2}, + { 0.8, 0.6, 0.2}, + { 0.8, 0.4, 0.2}, + { 0.9, 0.3, 0.2}, + { 1.0, 0.2, 0.2}, +}; + +/* set the color for the pressure plot according to temporary sac rate + * as compared to avg_sac; the calculation simply maps the delta between + * sac and avg_sac to indexes 0 .. (SAC_COLORS - 1) with everything + * more than 6000 ml/min below avg_sac mapped to 0 */ + +static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac) { - if (sac < 9) - set_source_rgba(gc, 0.0, 0.4, 0.2, 0.80); - else if (sac < 11) - set_source_rgba(gc, 0.2, 0.6, 0.2, 0.80); - else if (sac < 13) - set_source_rgba(gc, 0.4, 0.8, 0.2, 0.80); - else if (sac < 15) - set_source_rgba(gc, 0.6, 0.8, 0.2, 0.80); - else if (sac < 17) - set_source_rgba(gc, 0.8, 0.8, 0.2, 0.80); - else if (sac < 19) - set_source_rgba(gc, 0.8, 0.6, 0.2, 0.80); - else if (sac < 21) - set_source_rgba(gc, 0.8, 0.4, 0.2, 0.80); - else if (sac < 23) - set_source_rgba(gc, 0.9, 0.3, 0.2, 0.80); - else - set_source_rgba(gc, 1.0, 0.2, 0.2, 0.80); + int sac_index = 0; + int delta = sac - avg_sac + 7000; + + sac_index = delta / 2000; + if (sac_index < 0) + sac_index = 0; + if (sac_index > SAC_COLORS - 1) + sac_index = SAC_COLORS - 1; + set_source_rgb_struct(gc, &sac_color[sac_index]); } -/* calculate the current SAC in l/min */ -#define GET_LOCAL_SAC(_entry1, _entry2, _dive) \ +/* calculate the current SAC in ml/min and convert to int */ +#define GET_LOCAL_SAC(_entry1, _entry2, _dive) (int) \ ((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) * \ (_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter / \ (((_entry2)->sec - (_entry1)->sec) / 60.0) / \ (1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) / \ - 1000000.0) + 1000.0) #define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */ @@ -635,7 +647,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info int last = -1; int lift_pen = FALSE; int first_plot = TRUE; - double sac = 0.0; + int sac = 0; struct plot_data *last_entry = NULL; if (!get_cylinder_pressure_range(gc, pi)) @@ -657,22 +669,19 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info if (!last_entry) { last = i; last_entry = entry; - if (first_plot) { - /* don't start with a sac of 0 */ - int fe = i + 1; - struct plot_data *future_entry = pi->entry + fe; - while (fe < pi->nr && future_entry->sec - entry->sec < SAC_WINDOW) { - fe++; - future_entry = pi->entry + fe; - } - sac = GET_LOCAL_SAC(entry, future_entry, dive); + sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive); + } else { + int j; + sac = 0; + for (j = last; j < i; j++) + sac += GET_LOCAL_SAC(pi->entry + j, pi->entry + j + 1, dive); + sac /= (i - last); + if (entry->sec - last_entry->sec >= SAC_WINDOW) { + last++; + last_entry = pi->entry + last; } - } else if (entry->sec - last_entry->sec >= SAC_WINDOW) { - sac = GET_LOCAL_SAC(last_entry, entry, dive); - last++; - last_entry = pi->entry + last; } - set_sac_color(gc, sac); + set_sac_color(gc, sac, dive->sac); if (lift_pen) { if (!first_plot && entry->same_cylinder) { /* if we have a previous event from the same tank, @@ -705,7 +714,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec, plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit); } -static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi) +static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi, struct dive *dive) { int i; int mbar, cyl; @@ -751,7 +760,10 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) { if (last_time[cyl]) { - plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP); + if (dive->cylinder[cyl].end.mbar) + plot_pressure_value(gc, dive->cylinder[cyl].end.mbar, last_time[cyl], CENTER, TOP); + else + plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP); } } } @@ -986,10 +998,11 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi, list = NULL; continue; } - magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt; } + magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt; + } if (pt != 0.0) { double cur_pt = (entry->sec - (entry-1)->sec) * - (1 + entry->depth / 10000.0); + (1 + (entry->depth + (entry-1)->depth) / 20000.0); INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex] + cur_pt * magic; cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry); @@ -1128,8 +1141,13 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str while (ev && ev->time.seconds < sample->time.seconds) { /* insert two fake plot info structures for the end of * the old tank and the start of the new tank */ - entry->sec = ev->time.seconds; - (entry+1)->sec = ev->time.seconds + 1; + if (ev->time.seconds == sample->time.seconds - 1) { + entry->sec = ev->time.seconds - 1; + (entry+1)->sec = ev->time.seconds; + } else { + entry->sec = ev->time.seconds; + (entry+1)->sec = ev->time.seconds + 1; + } /* we need a fake depth - let's interpolate */ if (i) { entry->depth = sample->depth.mm - @@ -1205,7 +1223,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str } /* finally, do the discrete integration to get the SAC rate equivalent */ current->pressure_time += (entry->sec - (entry-1)->sec) * - (1 + entry->depth / 10000.0); + (1 + (entry->depth + (entry-1)->depth) / 20000.0); missing_pr |= !SENSOR_PRESSURE(entry); } @@ -1299,17 +1317,17 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru /* Temperature profile */ plot_temperature_profile(gc, pi); - /* Cylinder pressure plot */ - plot_cylinder_pressure(gc, pi, dive); - /* Depth profile */ plot_depth_profile(gc, pi); plot_events(gc, pi, dive); + /* Cylinder pressure plot */ + plot_cylinder_pressure(gc, pi, dive); + /* Text on top of all graphs.. */ plot_temperature_text(gc, pi); plot_depth_text(gc, pi); - plot_cylinder_pressure_text(gc, pi); + plot_cylinder_pressure_text(gc, pi, dive); /* Bounding box last */ gc->leftx = 0; gc->rightx = 1.0;