X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=7a0eac4975ac9b6e4755e23236407c142f211b24;hb=94516177605484dacf724602c43f34b984d06ba8;hp=cb0bc2d5da0a9e993e036112e11020ad7ce27030;hpb=3f624a2eb30ebc17abadedea888072186ea239bb;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index cb0bc2d..7a0eac4 100644 --- a/profile.c +++ b/profile.c @@ -14,6 +14,7 @@ #include "color.h" int selected_dive = 0; +int *selectiontracker; typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t; @@ -168,9 +169,10 @@ static void dump_pi (struct plot_info *pi) pi->maxpressure, pi->mintemp, pi->maxtemp); for (i = 0; i < pi->nr; i++) printf(" entry[%d]:{same_cylinder:%d cylinderindex:%d sec:%d pressure:{%d,%d}\n" - " temperature:%d depth:%d smoothed:%d}\n", + " time:%d:%02d temperature:%d depth:%d smoothed:%d}\n", i, pi->entry[i].same_cylinder, pi->entry[i].cylinderindex, pi->entry[i].sec, pi->entry[i].pressure[0], pi->entry[i].pressure[1], + pi->entry[i].sec / 60, pi->entry[i].sec % 60, pi->entry[i].temperature, pi->entry[i].depth, pi->entry[i].smoothed); printf(" }\n"); } @@ -1013,8 +1015,7 @@ static void dump_pr_track(pr_track_t **track_pr) } } -static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi, - pr_track_t **track_pr) +static void fill_missing_tank_pressures(struct plot_info *pi, pr_track_t **track_pr) { pr_track_t *list = NULL; pr_track_t *nlist = NULL; @@ -1337,7 +1338,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str pi->meandepth = dive->meandepth.mm; if (missing_pr) { - fill_missing_tank_pressures(dive, pi, track_pr); + fill_missing_tank_pressures(pi, track_pr); } for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) list_free(track_pr[cyl]); @@ -1382,13 +1383,13 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru gc->maxx = (drawing_area->width - 2*drawing_area->x); gc->maxy = (drawing_area->height - 2*drawing_area->y); - /* Temperature profile */ - plot_temperature_profile(gc, pi); - /* Depth profile */ plot_depth_profile(gc, pi); plot_events(gc, pi, dive); + /* Temperature profile */ + plot_temperature_profile(gc, pi); + /* Cylinder pressure plot */ plot_cylinder_pressure(gc, pi, dive);