mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve temperature text plotting in profile display

Browse source 
- make the text a lighter color so it stands out more
- change the heuristic when we print text to include both relative change
  in temperature and time since the last text was printed
- print the first temperature we encounter
- allow an ending temperature to be printed if the last printed
  temperature was before the 75% mark of the dive

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-11-09 13:01:11 -08:00
parent e38eb77e30
commit 4317bfaa11
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
profile.c
View file

@ -513,7 +513,7 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
{ {
double deg; double deg;
const char *unit; const char *unit;
static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP}; static const text_render_options_t tro = {12, 0.6, 0.6, 1.0, LEFT, TOP};
deg = get_temp_units(mkelvin, &unit); deg = get_temp_units(mkelvin, &unit);
@ -523,7 +523,7 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi) static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
{ {
int i; int i;
int last = 0, sec = 0; int last = -300, sec = 0;
int last_temperature = 0, last_printed_temp = 0; int last_temperature = 0, last_printed_temp = 0;
if (!setup_temperature_limits(gc, pi)) if (!setup_temperature_limits(gc, pi))
@ -537,14 +537,23 @@ static void plot_temperature_text(struct graphics_context *gc, struct plot_info
continue; continue;
last_temperature = mkelvin; last_temperature = mkelvin;
sec = entry->sec; sec = entry->sec;
if (sec < last + 300) /* don't print a temperature
* if it's been less than 5min and less than a 2K change OR
* if it's been less than 2min OR if the change from the
* last print is less than .4K (and therefore less than 1F */
if (((sec < last + 300) && (abs(mkelvin - last_printed_temp) < 2000)) ||
(sec < last + 120) ||
(abs(mkelvin - last_printed_temp) < 400))
continue; continue;
last = sec; last = sec;
plot_single_temp_text(gc,sec,mkelvin); plot_single_temp_text(gc,sec,mkelvin);
last_printed_temp = mkelvin; last_printed_temp = mkelvin;
} }
/* it would be nice to print the end temperature, if it's different */ /* it would be nice to print the end temperature, if it's
if (abs(last_temperature - last_printed_temp) > 500) * different or if the last temperature print has been more
* than a quarter of the dive back */
if ((abs(last_temperature - last_printed_temp) > 500) ||
((double)last / (double)sec < 0.75))
plot_single_temp_text(gc, sec, last_temperature); plot_single_temp_text(gc, sec, last_temperature);
} }