mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 13:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sacplot' of git://github.com/dirkhh/subsurface

Browse source 
* 'sacplot' of git://github.com/dirkhh/subsurface:
  Color tank pressure plot based on relative sac
This commit is contained in:
Linus Torvalds 2011-11-18 10:14:37 -02:00
commit 9930e1ecad
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
profile.c
View file

@ -595,36 +595,38 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
return pi->maxpressure != 0; return pi->maxpressure != 0;
} }
/* set the color for the pressure plot according to temporary sac rate */ /* set the color for the pressure plot according to temporary sac rate
static void set_sac_color(struct graphics_context *gc, double sac) * as compared to avg_sac */
static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
{ {
if (sac < 9) int delta = sac - avg_sac;
set_source_rgba(gc, 0.0, 0.4, 0.2, 0.80); if (delta < -6000)
else if (sac < 11) set_source_rgb(gc, 0.0, 0.4, 0.2);
set_source_rgba(gc, 0.2, 0.6, 0.2, 0.80); else if (delta < -4000)
else if (sac < 13) set_source_rgb(gc, 0.2, 0.6, 0.2);
set_source_rgba(gc, 0.4, 0.8, 0.2, 0.80); else if (delta < -2000)
else if (sac < 15) set_source_rgb(gc, 0.4, 0.8, 0.2);
set_source_rgba(gc, 0.6, 0.8, 0.2, 0.80); else if (delta < 0)
else if (sac < 17) set_source_rgb(gc, 0.6, 0.8, 0.2);
set_source_rgba(gc, 0.8, 0.8, 0.2, 0.80); else if (delta < 2000)
else if (sac < 19) set_source_rgb(gc, 0.8, 0.8, 0.2);
set_source_rgba(gc, 0.8, 0.6, 0.2, 0.80); else if (delta < 4000)
else if (sac < 21) set_source_rgb(gc, 0.8, 0.6, 0.2);
set_source_rgba(gc, 0.8, 0.4, 0.2, 0.80); else if (delta < 6000)
else if (sac < 23) set_source_rgb(gc, 0.8, 0.4, 0.2);
set_source_rgba(gc, 0.9, 0.3, 0.2, 0.80); else if (delta < 8000)
set_source_rgb(gc, 0.9, 0.3, 0.2);
else else
set_source_rgba(gc, 1.0, 0.2, 0.2, 0.80); set_source_rgb(gc, 1.0, 0.2, 0.2);
} }
/* calculate the current SAC in l/min */ /* calculate the current SAC in ml/min and convert to int */
#define GET_LOCAL_SAC(_entry1, _entry2, _dive) \ #define GET_LOCAL_SAC(_entry1, _entry2, _dive) (int) \
((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) * \ ((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) * \
(_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter / \ (_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter / \
(((_entry2)->sec - (_entry1)->sec) / 60.0) / \ (((_entry2)->sec - (_entry1)->sec) / 60.0) / \
(1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) / \ (1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) / \
1000000.0) 1000.0)
#define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */ #define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */
@ -635,7 +637,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
int last = -1; int last = -1;
int lift_pen = FALSE; int lift_pen = FALSE;
int first_plot = TRUE; int first_plot = TRUE;
double sac = 0.0; int sac = 0;
struct plot_data *last_entry = NULL; struct plot_data *last_entry = NULL;
if (!get_cylinder_pressure_range(gc, pi)) if (!get_cylinder_pressure_range(gc, pi))
@ -672,7 +674,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
last++; last++;
last_entry = pi->entry + last; last_entry = pi->entry + last;
} }
set_sac_color(gc, sac); set_sac_color(gc, sac, dive->sac);
if (lift_pen) { if (lift_pen) {
if (!first_plot && entry->same_cylinder) { if (!first_plot && entry->same_cylinder) {
/* if we have a previous event from the same tank, /* if we have a previous event from the same tank,