mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify/clean up depth min/max finder

Browse source 
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-07 15:50:07 -07:00
parent d4a1dfb3d9
commit cfcc811efe
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
profile.c
View file

@ -146,6 +146,28 @@ static struct sample *next_minmax(struct sample *sample, struct sample *end, int
return result; return result;
} }
static void render_depth_sample(struct graphics_context *gc, struct sample *sample)
{
text_render_options_t tro = {1.0, 0.2, 0.2, CENTER};
int sec = sample->time.seconds;
depth_t depth = sample->depth;
const char *fmt;
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);
}
void plot_text_samples(struct dive *dive, struct graphics_context *gc, void plot_text_samples(struct dive *dive, struct graphics_context *gc,
struct sample *a, struct sample *b) struct sample *a, struct sample *b)
{ {
@ -158,34 +180,13 @@ void plot_text_samples(struct dive *dive, struct graphics_context *gc,
max = next_minmax(a, b, 1); max = next_minmax(a, b, 1);
if (max) { if (max) {
text_render_options_t tro = {1.0, 0.2, 0.2, CENTER}; render_depth_sample(gc, max);
int sec = max->time.seconds;
depth_t depth = max->depth;
const char *fmt;
double d;
min = next_minmax(max, b, 0); min = next_minmax(max, b, 0);
plot_text_samples(dive, gc, a, max);
if (min) { if (min) {
plot_text_samples(dive, gc, max, min);
plot_text_samples(dive, gc, min, b); plot_text_samples(dive, gc, min, b);
} else
plot_text_samples(dive, gc, max, b);
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);
return; return;
} }
}
} }
static void plot_depth_text(struct dive *dive, struct graphics_context *gc) static void plot_depth_text(struct dive *dive, struct graphics_context *gc)