mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 07:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sacplot' of git://git.hohndel.org/subsurface

Browse source 
* 'sacplot' of git://git.hohndel.org/subsurface:
  Correctly plot the tank end pressure if it was set manually
This commit is contained in:
Linus Torvalds 2011-11-19 12:59:48 -08:00
commit 2d26dbc9f7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
profile.c
View file

@ -717,7 +717,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit); 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 i;
int mbar, cyl; int mbar, cyl;
@ -763,6 +763,9 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) { for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
if (last_time[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);
} }
} }
@ -1322,7 +1325,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
/* Text on top of all graphs.. */ /* Text on top of all graphs.. */
plot_temperature_text(gc, pi); plot_temperature_text(gc, pi);
plot_depth_text(gc, pi); plot_depth_text(gc, pi);
plot_cylinder_pressure_text(gc, pi); plot_cylinder_pressure_text(gc, pi, dive);
/* Bounding box last */ /* Bounding box last */
gc->leftx = 0; gc->rightx = 1.0; gc->leftx = 0; gc->rightx = 1.0;