X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=1b7db1d904909bbb440dfe4e184e0579132fafa1;hb=f3134cbb8995267e6a18b9564f3022e7fe7314a9;hp=f2cc526dd7ff4f15e33d2f85be1d080d6452cd8d;hpb=6eefcf40e68c2a5cf35c35b92ed7529072e5da64;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index f2cc526..1b7db1d 100644 --- a/profile.c +++ b/profile.c @@ -158,22 +158,12 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t * static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro) { - int sec = entry->sec; - depth_t depth = { entry->val }; - const char *fmt; + int sec = entry->sec, decimals; double d; - switch (output_units.length) { - case METERS: - d = depth.mm / 1000.0; - fmt = "%.1f"; - break; - case FEET: - d = to_feet(depth); - fmt = "%.0f"; - break; - } - plot_text(gc, tro, sec, depth.mm, fmt, d); + d = get_depth_units(entry->val, &decimals, NULL); + + plot_text(gc, tro, sec, entry->val, "%.*f", decimals, d); } static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi) @@ -620,7 +610,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi) /* if our samples are short and we aren't too FAST*/ if (entry[0].sec - entry[-1].sec < 30 && entry->velocity < FAST) { int past = -2; - while (pi->entry <= entry-past && entry[0].sec - entry[past].sec < 30) + while (i+past > 0 && entry[0].sec - entry[past].sec < 30) past--; entry->velocity = velocity((entry[0].val - entry[past].val) / (entry[0].sec - entry[past].sec));