X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=aedea192b3583a85f0945259d7dca193105eb6d6;hb=671f6544ac8b4a6eb68576b37344e84808511eb8;hp=47e12ba66352421b6cc36790ba1b293f43edf52f;hpb=855df669d9aa3a30a8a5db708a63ee9991968bab;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index 47e12ba..aedea19 100644 --- a/profile.c +++ b/profile.c @@ -714,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, struct dive *dive) +static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi) { int i; int mbar, cyl; @@ -760,10 +760,7 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) { if (last_time[cyl]) { - 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); + plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP); } } } @@ -1004,7 +1001,7 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi, double cur_pt = (entry->sec - (entry-1)->sec) * (1 + (entry->depth + (entry-1)->depth) / 20000.0); INTERPOLATED_PRESSURE(entry) = - cur_pr[entry->cylinderindex] + cur_pt * magic; + cur_pr[entry->cylinderindex] + cur_pt * magic + 0.5; cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry); } else INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex]; @@ -1327,7 +1324,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru /* Text on top of all graphs.. */ plot_temperature_text(gc, pi); plot_depth_text(gc, pi); - plot_cylinder_pressure_text(gc, pi, dive); + plot_cylinder_pressure_text(gc, pi); /* Bounding box last */ gc->leftx = 0; gc->rightx = 1.0;