#include "dive.h"
#include "display.h"
#include "divelist.h"
+#include "color.h"
int selected_dive = 0;
typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t;
+
/* Plot info with smoothing, velocity indication
* and one-, two- and three-minute minimums and maximums */
struct plot_info {
int nr;
int maxtime;
int meandepth, maxdepth;
- int minpressure, maxpressure;
- int endpressure; /* start pressure better be max pressure */
+ int maxpressure;
int mintemp, maxtemp;
struct plot_data {
unsigned int same_cylinder:1;
int avg[3];
} entry[];
};
+
#define SENSOR_PR 0
#define INTERPOLATED_PR 1
#define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]
#define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR]
+#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
+
+#define SAC_COLORS_START_IDX SAC_1
+#define SAC_COLORS 9
+#define VELOCITY_COLORS_START_IDX VELO_STABLE
+#define VELOCITY_COLORS 5
+
+typedef enum {
+ /* SAC colors. Order is important, the SAC_COLORS_START_IDX define above. */
+ SAC_1, SAC_2, SAC_3, SAC_4, SAC_5, SAC_6, SAC_7, SAC_8, SAC_9,
-/* convert velocity to colors */
-typedef struct { double r, g, b; } rgb_t;
-static const rgb_t rgb[] = {
- [STABLE] = {0.0, 0.4, 0.0},
- [SLOW] = {0.4, 0.8, 0.0},
- [MODERATE] = {0.8, 0.8, 0.0},
- [FAST] = {0.8, 0.5, 0.0},
- [CRAZY] = {1.0, 0.0, 0.0},
+ /* Velocity colors. Order is still important, ref VELOCITY_COLORS_START_IDX. */
+ VELO_STABLE, VELO_SLOW, VELO_MODERATE, VELO_FAST, VELO_CRAZY,
+
+ /* Other colors */
+ TEXT_BACKGROUND, ALERT_BG, ALERT_FG, EVENTS, SAMPLE_DEEP, SAMPLE_SHALLOW,
+ SMOOTHED, MINUTE, TIME_GRID, TIME_TEXT, DEPTH_GRID, MEAN_DEPTH, DEPTH_TOP,
+ DEPTH_BOTTOM, TEMP_TEXT, TEMP_PLOT, SAC_DEFAULT, BOUNDING_BOX, PRESSURE_TEXT, BACKGROUND
+} color_indice_t;
+
+typedef struct {
+ /* media[0] is screen, and media[1] is printer */
+ struct rgba {
+ double r,g,b,a;
+ } media[2];
+} color_t;
+
+/* [color indice] = {{screen color, printer color}} */
+static const color_t profile_color[] = {
+ [SAC_1] = {{FUNGREEN1, BLACK1_LOW_TRANS}},
+ [SAC_2] = {{APPLE1, BLACK1_LOW_TRANS}},
+ [SAC_3] = {{ATLANTIS1, BLACK1_LOW_TRANS}},
+ [SAC_4] = {{ATLANTIS2, BLACK1_LOW_TRANS}},
+ [SAC_5] = {{EARLSGREEN1, BLACK1_LOW_TRANS}},
+ [SAC_6] = {{HOKEYPOKEY1, BLACK1_LOW_TRANS}},
+ [SAC_7] = {{TUSCANY1, BLACK1_LOW_TRANS}},
+ [SAC_8] = {{CINNABAR1, BLACK1_LOW_TRANS}},
+ [SAC_9] = {{REDORANGE1, BLACK1_LOW_TRANS}},
+
+ [VELO_STABLE] = {{CAMARONE1, BLACK1_LOW_TRANS}},
+ [VELO_SLOW] = {{LIMENADE1, BLACK1_LOW_TRANS}},
+ [VELO_MODERATE] = {{RIOGRANDE1, BLACK1_LOW_TRANS}},
+ [VELO_FAST] = {{PIRATEGOLD1, BLACK1_LOW_TRANS}},
+ [VELO_CRAZY] = {{RED1, BLACK1_LOW_TRANS}},
+
+ [TEXT_BACKGROUND] = {{CONCRETE1_LOWER_TRANS, WHITE1}},
+ [ALERT_BG] = {{BROOM1_LOWER_TRANS, BLACK1_LOW_TRANS}},
+ [ALERT_FG] = {{BLACK1_LOW_TRANS, BLACK1_LOW_TRANS}},
+ [EVENTS] = {{REDORANGE1, BLACK1_LOW_TRANS}},
+ [SAMPLE_DEEP] = {{PERSIANRED1, BLACK1_LOW_TRANS}},
+ [SAMPLE_SHALLOW] = {{PERSIANRED1, BLACK1_LOW_TRANS}},
+ [SMOOTHED] = {{REDORANGE1_HIGH_TRANS, BLACK1_LOW_TRANS}},
+ [MINUTE] = {{MEDIUMREDVIOLET1_HIGHER_TRANS, BLACK1_LOW_TRANS}},
+ [TIME_GRID] = {{WHITE1, TUNDORA1_MED_TRANS}},
+ [TIME_TEXT] = {{FORESTGREEN1, BLACK1_LOW_TRANS}},
+ [DEPTH_GRID] = {{WHITE1, TUNDORA1_MED_TRANS}},
+ [MEAN_DEPTH] = {{REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS}},
+ [DEPTH_BOTTOM] = {{GOVERNORBAY1_MED_TRANS, TUNDORA1_MED_TRANS}},
+ [DEPTH_TOP] = {{MERCURY1_MED_TRANS, WHITE1_MED_TRANS}},
+ [TEMP_TEXT] = {{GOVERNORBAY2, BLACK1_LOW_TRANS}},
+ [TEMP_PLOT] = {{ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS}},
+ [SAC_DEFAULT] = {{WHITE1, BLACK1_LOW_TRANS}},
+ [BOUNDING_BOX] = {{WHITE1, BLACK1_LOW_TRANS}},
+ [PRESSURE_TEXT] = {{KILLARNEY1, BLACK1_LOW_TRANS}},
+ [BACKGROUND] = {{SPRINGWOOD1, BLACK1_LOW_TRANS}},
};
#define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
cairo_line_to(gc->cr, SCALE(gc, x, y));
}
-static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
+static void set_source_rgba(struct graphics_context *gc, color_indice_t c)
{
- /*
- * For printers, we still honor 'a', but ignore colors
- * for now. Black is white and white is black
- */
- if (gc->printer) {
- double sum = r+g+b;
- if (sum > 0.8)
- r = g = b = 0;
- else
- r = g = b = 1;
- }
+ const color_t *col = &profile_color[c];
+ struct rgba rgb = col->media[gc->printer];
+ double r = rgb.r;
+ double g = rgb.g;
+ double b = rgb.b;
+ double a = rgb.a;
+
cairo_set_source_rgba(gc->cr, r, g, b, a);
}
-void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
+void init_profile_background(struct graphics_context *gc)
{
- set_source_rgba(gc, r, g, b, 1);
+ set_source_rgba(gc, BACKGROUND);
+}
+
+void pattern_add_color_stop_rgba(struct graphics_context *gc, cairo_pattern_t *pat, double o, color_indice_t c)
+{
+ const color_t *col = &profile_color[c];
+ struct rgba rgb = col->media[gc->printer];
+ cairo_pattern_add_color_stop_rgba(pat, o, rgb.r, rgb.g, rgb.b, rgb.a);
}
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
+/* debugging tool - not normally used */
+static void dump_pi (struct plot_info *pi)
+{
+ int i;
+
+ printf("pi:{nr:%d maxtime:%d meandepth:%d maxdepth:%d \n"
+ " maxpressure:%d mintemp:%d maxtemp:%d\n",
+ pi->nr, pi->maxtime, pi->meandepth, pi->maxdepth,
+ 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"
+ " 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");
+}
+
/*
* When showing dive profiles, we scale things to the
* current dive. However, we don't scale past less than
typedef struct {
int size;
- double r,g,b;
+ color_indice_t color;
double hpos, vpos;
} text_render_options_t;
cairo_rel_move_to(cr, dx, dy);
cairo_text_path(cr, buffer);
- set_source_rgb(gc, 0, 0, 0);
+ set_source_rgba(gc, TEXT_BACKGROUND);
cairo_stroke(cr);
move_to(gc, x, y);
cairo_rel_move_to(cr, dx, dy);
- set_source_rgb(gc, tro->r, tro->g, tro->b);
+ set_source_rgba(gc, tro->color);
cairo_show_text(cr, buffer);
}
/* draw a little tirangular marker and attach tooltip */
x = SCALEX(gc, event->time.seconds);
y = SCALEY(gc, depth);
- set_source_rgba(gc, 1.0, 1.0, 0.1, 0.8);
+ set_source_rgba(gc, ALERT_BG);
cairo_move_to(gc->cr, x-15, y+6);
cairo_line_to(gc->cr, x-3 , y+6);
cairo_line_to(gc->cr, x-9, y-6);
cairo_line_to(gc->cr, x-15, y+6);
cairo_stroke_preserve(gc->cr);
cairo_fill(gc->cr);
- set_source_rgba(gc, 0.0, 0.0, 0.0, 0.8);
+ set_source_rgba(gc, ALERT_FG);
cairo_move_to(gc->cr, x-9, y-3);
cairo_line_to(gc->cr, x-9, y+1);
cairo_move_to(gc->cr, x-9, y+4);
static void plot_events(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
{
- static const text_render_options_t tro = {14, 1.0, 0.2, 0.2, CENTER, TOP};
+ static const text_render_options_t tro = {14, EVENTS, CENTER, TOP};
struct event *event = dive->events;
if (gc->printer)
static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
{
- static const text_render_options_t deep = {14, 1.0, 0.2, 0.2, CENTER, TOP};
- static const text_render_options_t shallow = {14, 1.0, 0.2, 0.2, CENTER, BOTTOM};
+ static const text_render_options_t deep = {14, SAMPLE_DEEP, CENTER, TOP};
+ static const text_render_options_t shallow = {14, SAMPLE_SHALLOW, CENTER, BOTTOM};
int i;
+ int last = -1;
for (i = 0; i < pi->nr; i++) {
struct plot_data *entry = pi->entry + i;
if (entry->depth < 2000)
continue;
- if (entry == entry->max[2])
+ if ((entry == entry->max[2]) && entry->depth != last) {
render_depth_sample(gc, entry, &deep);
+ last = entry->depth;
+ }
- if (entry == entry->min[2])
+ if ((entry == entry->min[2]) && entry->depth != last) {
render_depth_sample(gc, entry, &shallow);
+ last = entry->depth;
+ }
+
+ if (entry->depth != last)
+ last = -1;
}
}
int i;
struct plot_data *entry = pi->entry;
- set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
+ set_source_rgba(gc, SMOOTHED);
move_to(gc, entry->sec, entry->smoothed);
for (i = 1; i < pi->nr; i++) {
entry++;
}
static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi,
- int index, double a)
+ int index)
{
int i;
struct plot_data *entry = pi->entry;
- set_source_rgba(gc, 1, 0.2, 1, a);
+ set_source_rgba(gc, MINUTE);
move_to(gc, entry->sec, entry->min[index]->depth);
for (i = 1; i < pi->nr; i++) {
entry++;
{
if (gc->printer)
return;
- plot_minmax_profile_minute(gc, pi, 2, 0.1);
- plot_minmax_profile_minute(gc, pi, 1, 0.1);
- plot_minmax_profile_minute(gc, pi, 0, 0.1);
+ plot_minmax_profile_minute(gc, pi, 2);
+ plot_minmax_profile_minute(gc, pi, 1);
+ plot_minmax_profile_minute(gc, pi, 0);
}
static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi)
gc->leftx = 0; gc->rightx = maxtime;
gc->topy = 0; gc->bottomy = 1.0;
- set_source_rgba(gc, 1, 1, 1, 0.5);
+ set_source_rgba(gc, TIME_GRID);
+ cairo_set_line_width(gc->cr, 2);
+
for (i = incr; i < maxtime; i += incr) {
move_to(gc, i, 0);
line_to(gc, i, 1);
cairo_stroke(cr);
/* now the text on every second time marker */
- text_render_options_t tro = {10, 0.2, 1.0, 0.2, CENTER, TOP};
+ text_render_options_t tro = {10, TIME_TEXT, CENTER, TOP};
for (i = incr; i < maxtime; i += 2 * incr)
plot_text(gc, &tro, i, 1, "%d", i/60);
case FEET: marker = 9144; break; /* 30 ft */
}
- set_source_rgba(gc, 1, 1, 1, 0.5);
+ set_source_rgba(gc, DEPTH_GRID);
for (i = marker; i < maxdepth; i += marker) {
move_to(gc, 0, i);
line_to(gc, 1, i);
/* Show mean depth */
if (! gc->printer) {
- set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
+ set_source_rgba(gc, MEAN_DEPTH);
move_to(gc, 0, pi->meandepth);
line_to(gc, 1, pi->meandepth);
cairo_stroke(cr);
plot_minmax_profile(gc, pi);
}
- set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-
/* Do the depth profile for the neat fill */
gc->topy = 0; gc->bottomy = maxdepth;
- set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
+
+ cairo_pattern_t *pat;
+ pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, 256.0);
+ pattern_add_color_stop_rgba (gc, pat, 1, DEPTH_BOTTOM);
+ pattern_add_color_stop_rgba (gc, pat, 0, DEPTH_TOP);
+
+ cairo_set_source(gc->cr, pat);
+ cairo_pattern_destroy(pat);
+ cairo_set_line_width(gc->cr, 2);
entry = pi->entry;
move_to(gc, 0, 0);
for (i = 0; i < pi->nr; i++, entry++)
line_to(gc, entry->sec, entry->depth);
cairo_close_path(gc->cr);
- if (gc->printer) {
- set_source_rgba(gc, 1, 1, 1, 0.2);
- cairo_fill_preserve(cr);
- set_source_rgb(gc, 1, 1, 1);
- cairo_stroke(cr);
- return;
- }
+
cairo_fill(gc->cr);
/* Now do it again for the velocity colors */
/* we want to draw the segments in different colors
* representing the vertical velocity, so we need to
* chop this into short segments */
- rgb_t color = rgb[entry->velocity];
depth = entry->depth;
- set_source_rgb(gc, color.r, color.g, color.b);
+ set_source_rgba(gc, VELOCITY_COLORS_START_IDX + entry->velocity);
move_to(gc, entry[-1].sec, entry[-1].depth);
line_to(gc, sec, depth);
cairo_stroke(cr);
static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
{
- int deg;
+ double deg;
const char *unit;
- static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
- temperature_t temperature = { mkelvin };
+ static const text_render_options_t tro = {12, TEMP_TEXT, LEFT, TOP};
- if (output_units.temperature == FAHRENHEIT) {
- deg = to_F(temperature);
- unit = UTF8_DEGREE "F";
- } else {
- deg = to_C(temperature);
- unit = UTF8_DEGREE "C";
- }
- plot_text(gc, &tro, sec, temperature.mkelvin, "%d%s", deg, unit);
+ deg = get_temp_units(mkelvin, &unit);
+
+ plot_text(gc, &tro, sec, mkelvin, "%d%s", (int)(deg + 0.5), unit);
}
static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
{
int i;
- int last = 0, sec = 0;
+ int last = -300, sec = 0;
int last_temperature = 0, last_printed_temp = 0;
if (!setup_temperature_limits(gc, pi))
continue;
last_temperature = mkelvin;
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;
last = sec;
plot_single_temp_text(gc,sec,mkelvin);
last_printed_temp = mkelvin;
}
- /* it would be nice to print the end temperature, if it's different */
- if (abs(last_temperature - last_printed_temp) > 500)
+ /* it would be nice to print the end temperature, if it's
+ * 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);
}
if (!setup_temperature_limits(gc, pi))
return;
- set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
+ cairo_set_line_width(gc->cr, 2);
+ set_source_rgba(gc, TEMP_PLOT);
for (i = 0; i < pi->nr; i++) {
struct plot_data *entry = pi->entry + i;
int mkelvin = entry->temperature;
return pi->maxpressure != 0;
}
-static void plot_pressure_helper(struct graphics_context *gc, struct plot_info *pi, int type)
+/* set the color for the pressure plot according to temporary sac rate
+ * as compared to avg_sac; the calculation simply maps the delta between
+ * sac and avg_sac to indexes 0 .. (SAC_COLORS - 1) with everything
+ * more than 6000 ml/min below avg_sac mapped to 0 */
+
+static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
+{
+ int sac_index = 0;
+ int delta = sac - avg_sac + 7000;
+
+ if (!gc->printer) {
+ sac_index = delta / 2000;
+ if (sac_index < 0)
+ sac_index = 0;
+ if (sac_index > SAC_COLORS - 1)
+ sac_index = SAC_COLORS - 1;
+ set_source_rgba(gc, SAC_COLORS_START_IDX + sac_index);
+ } else {
+ set_source_rgba(gc, SAC_DEFAULT);
+ }
+}
+
+/* calculate the current SAC in ml/min and convert to int */
+#define GET_LOCAL_SAC(_entry1, _entry2, _dive) (int) \
+ ((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) * \
+ (_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter / \
+ (((_entry2)->sec - (_entry1)->sec) / 60.0) / \
+ (1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) / \
+ 1000.0)
+
+#define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */
+
+static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi,
+ struct dive *dive)
{
int i;
+ int last = -1;
int lift_pen = FALSE;
+ int first_plot = TRUE;
+ int sac = 0;
+ struct plot_data *last_entry = NULL;
+
+ if (!get_cylinder_pressure_range(gc, pi))
+ return;
+
+ cairo_set_line_width(gc->cr, 2);
for (i = 0; i < pi->nr; i++) {
int mbar;
struct plot_data *entry = pi->entry + i;
- mbar = entry->pressure[type];
- if (!entry->same_cylinder)
+ mbar = GET_PRESSURE(entry);
+ if (!entry->same_cylinder) {
lift_pen = TRUE;
+ last_entry = NULL;
+ }
if (!mbar) {
lift_pen = TRUE;
continue;
}
+ if (!last_entry) {
+ last = i;
+ last_entry = entry;
+ sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
+ } else {
+ int j;
+ sac = 0;
+ for (j = last; j < i; j++)
+ sac += GET_LOCAL_SAC(pi->entry + j, pi->entry + j + 1, dive);
+ sac /= (i - last);
+ if (entry->sec - last_entry->sec >= SAC_WINDOW) {
+ last++;
+ last_entry = pi->entry + last;
+ }
+ }
+ set_sac_color(gc, sac, dive->sac);
if (lift_pen) {
- if (i > 0 && entry->same_cylinder) {
+ if (!first_plot && entry->same_cylinder) {
/* if we have a previous event from the same tank,
- * draw at least a short line .
- * This uses the implementation detail that the
- * type is either 0 or 1 */
+ * draw at least a short line */
int prev_pr;
- prev_pr = (entry-1)->pressure[type] ? : (entry-1)->pressure[1 - type];
+ prev_pr = GET_PRESSURE(entry - 1);
move_to(gc, (entry-1)->sec, prev_pr);
line_to(gc, entry->sec, mbar);
- } else
+ } else {
+ first_plot = FALSE;
move_to(gc, entry->sec, mbar);
+ }
lift_pen = FALSE;
- }
- else
+ } else {
line_to(gc, entry->sec, mbar);
+ }
+ cairo_stroke(gc->cr);
+ move_to(gc, entry->sec, mbar);
}
- cairo_stroke(gc->cr);
-
-}
-
-static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
-{
- if (!get_cylinder_pressure_range(gc, pi))
- return;
-
- /* first plot the pressure readings we have from the dive computer */
- set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
- plot_pressure_helper(gc, pi, SENSOR_PR);
-
- /* then, in a different color, the interpolated values */
- set_source_rgba(gc, 1.0, 1.0, 0.2, 0.80);
- plot_pressure_helper(gc, pi, INTERPOLATED_PR);
-}
-
-static int mbar_to_PSI(int mbar)
-{
- pressure_t p = {mbar};
- return to_PSI(p);
}
static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
int pressure;
const char *unit;
- switch (output_units.pressure) {
- case PASCAL:
- pressure = mbar * 100;
- unit = "pascal";
- break;
- case BAR:
- pressure = (mbar + 500) / 1000;
- unit = "bar";
- break;
- case PSI:
- pressure = mbar_to_PSI(mbar);
- unit = "psi";
- break;
- }
- text_render_options_t tro = {10, 0.2, 1.0, 0.2, xalign, yalign};
+ pressure = get_pressure_units(mbar, &unit);
+ text_render_options_t tro = {10, PRESSURE_TEXT, xalign, yalign};
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
}
if (!get_cylinder_pressure_range(gc, pi))
return;
- /* only loop over the actual events from the dive computer */
- for (i = 2; i < pi->nr - 2; i++) {
+ /* only loop over the actual events from the dive computer
+ * plus the second synthetic event at the start (to make sure
+ * we get "time=0" right)
+ * sadly with a recent change that first entry may no longer
+ * have any pressure reading - in that case just grab the
+ * pressure from the second entry */
+ if (GET_PRESSURE(pi->entry + 1) == 0 && GET_PRESSURE(pi->entry + 2) !=0)
+ INTERPOLATED_PRESSURE(pi->entry + 1) = GET_PRESSURE(pi->entry + 2);
+ for (i = 1; i < pi->nr; i++) {
entry = pi->entry + i;
if (!entry->same_cylinder) {
cyl = entry->cylinderindex;
if (!seen_cyl[cyl]) {
- mbar = SENSOR_PRESSURE(entry) ? : INTERPOLATED_PRESSURE(entry);
+ mbar = GET_PRESSURE(entry);
plot_pressure_value(gc, mbar, entry->sec, LEFT, BOTTOM);
seen_cyl[cyl] = TRUE;
}
/* remember the last pressure and time of
* the previous cylinder */
cyl = (entry - 1)->cylinderindex;
- last_pressure[cyl] =
- SENSOR_PRESSURE(entry - 1) ? : INTERPOLATED_PRESSURE(entry - 1);
+ last_pressure[cyl] = GET_PRESSURE(entry - 1);
last_time[cyl] = (entry - 1)->sec;
}
}
}
cyl = entry->cylinderindex;
- last_pressure[cyl] = SENSOR_PRESSURE(entry) ? : INTERPOLATED_PRESSURE(entry);
+ if (GET_PRESSURE(entry))
+ last_pressure[cyl] = GET_PRESSURE(entry);
last_time[cyl] = entry->sec;
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
/* Do pressure min/max based on the non-surface data */
for (i = 0; i < nr; i++) {
struct plot_data *entry = pi->entry+i;
- int pressure = SENSOR_PRESSURE(entry) ? : INTERPOLATED_PRESSURE(entry);
+ int pressure = GET_PRESSURE(entry);
int temperature = entry->temperature;
if (pressure) {
- if (!pi->minpressure || pressure < pi->minpressure)
- pi->minpressure = pressure;
if (pressure > pi->maxpressure)
pi->maxpressure = pressure;
}
free(list);
}
-static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
- pr_track_t **track_pr)
+static void dump_pr_track(pr_track_t **track_pr)
+{
+ int cyl;
+ pr_track_t *list;
+
+ for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
+ list = track_pr[cyl];
+ while (list) {
+ printf("cyl%d: start %d end %d t_start %d t_end %d pt %6.3f\n", cyl,
+ list->start, list->end, list->t_start, list->t_end, list->pressure_time);
+ list = list->next;
+ }
+ }
+}
+
+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;
struct plot_data *entry;
int cur_pr[MAX_CYLINDERS];
+ if (0) {
+ /* another great debugging tool */
+ dump_pr_track(track_pr);
+ }
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
cur_pr[cyl] = track_pr[cyl]->start;
}
- for (i = 0; i < dive->samples; i++) {
- entry = pi->entry + i + 2;
+
+ /* The first two are "fillers", but in case we don't have a sample
+ * at time 0 we need to process the second of them here */
+ for (i = 1; i < pi->nr; i++) {
+ entry = pi->entry + i;
if (SENSOR_PRESSURE(entry)) {
cur_pr[entry->cylinderindex] = SENSOR_PRESSURE(entry);
} else {
if (!nlist) {
/* just continue without calculating
* interpolated values */
+ INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
list = NULL;
continue;
}
- magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt; }
+ magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;
+ }
if (pt != 0.0) {
double cur_pt = (entry->sec - (entry-1)->sec) *
- (1 + entry->depth / 10000.0);
+ (1 + (entry->depth + (entry-1)->depth) / 20000.0);
INTERPOLATED_PRESSURE(entry) =
- cur_pr[entry->cylinderindex] + cur_pt * magic;
+ cur_pr[entry->cylinderindex] + cur_pt * magic + 0.5;
cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
- }
+ } else
+ INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
}
}
}
set_cylinder_index(pi, i, cylinderindex, ~0u);
}
+/* for computers that track gas changes through events */
+static int count_gas_change_events(struct dive *dive)
+{
+ int count = 0;
+ struct event *ev = get_next_gaschange(dive->events);
+
+ while (ev) {
+ count++;
+ ev = get_next_gaschange(ev->next);
+ }
+ return count;
+}
+
/*
* Create a plot-info with smoothing and ranged min/max
*
* sides, so that you can do end-points without having to worry
* about it.
*/
-static struct plot_info *create_plot_info(struct dive *dive)
+static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, struct sample *dive_sample)
{
int cylinderindex = -1;
int lastdepth, lastindex;
- int i, nr = dive->samples + 4, sec, cyl;
- size_t alloc_size = plot_info_size(nr);
+ int i, pi_idx, nr, sec, cyl;
+ size_t alloc_size;
struct plot_info *pi;
pr_track_t *track_pr[MAX_CYLINDERS] = {NULL, };
pr_track_t *pr_track, *current;
gboolean missing_pr = FALSE;
struct plot_data *entry = NULL;
+ struct event *ev;
+ /* we want to potentially add synthetic plot_info elements for the gas changes */
+ nr = nr_samples + 4 + 2 * count_gas_change_events(dive);
+ alloc_size = plot_info_size(nr);
pi = malloc(alloc_size);
if (!pi)
return pi;
memset(pi, 0, alloc_size);
pi->nr = nr;
+ pi_idx = 2; /* the two extra events at the start */
+ /* check for gas changes before the samples start */
+ ev = get_next_gaschange(dive->events);
+ while (ev && ev->time.seconds < dive_sample->time.seconds) {
+ entry = pi->entry + pi_idx;
+ entry->sec = ev->time.seconds;
+ entry->depth = 0; /* is that always correct ? */
+ pi_idx++;
+ ev = get_next_gaschange(ev->next);
+ }
+ if (ev && ev->time.seconds == dive_sample->time.seconds) {
+ /* we already have a sample at the time of the event */
+ ev = get_next_gaschange(ev->next);
+ }
sec = 0;
lastindex = 0;
lastdepth = -1;
- for (i = 0; i < dive->samples; i++) {
+ for (i = 0; i < nr_samples; i++) {
int depth;
- struct sample *sample = dive->sample+i;
-
- entry = pi->entry + i + 2;
- sec = entry->sec = sample->time.seconds;
+ int delay = 0;
+ struct sample *sample = dive_sample+i;
+
+ entry = pi->entry + i + pi_idx;
+ while (ev && ev->time.seconds < sample->time.seconds) {
+ /* insert two fake plot info structures for the end of
+ * the old tank and the start of the new tank */
+ if (ev->time.seconds == sample->time.seconds - 1) {
+ entry->sec = ev->time.seconds - 1;
+ (entry+1)->sec = ev->time.seconds;
+ } else {
+ entry->sec = ev->time.seconds;
+ (entry+1)->sec = ev->time.seconds + 1;
+ }
+ /* we need a fake depth - let's interpolate */
+ if (i) {
+ entry->depth = sample->depth.mm -
+ (sample->depth.mm - (sample-1)->depth.mm) / 2;
+ } else
+ entry->depth = sample->depth.mm;
+ (entry+1)->depth = entry->depth;
+ pi_idx += 2;
+ entry = pi->entry + i + pi_idx;
+ ev = get_next_gaschange(ev->next);
+ }
+ if (ev && ev->time.seconds == sample->time.seconds) {
+ /* we already have a sample at the time of the event
+ * just add a new one for the old tank and delay the
+ * real even by one second (to keep time monotonous) */
+ entry->sec = ev->time.seconds;
+ entry->depth = sample->depth.mm;
+ pi_idx++;
+ entry = pi->entry + i + pi_idx;
+ ev = get_next_gaschange(ev->next);
+ delay = 1;
+ }
+ sec = entry->sec = sample->time.seconds + delay;
depth = entry->depth = sample->depth.mm;
entry->cylinderindex = sample->cylinderindex;
SENSOR_PRESSURE(entry) = sample->cylinderpressure.mbar;
entry->temperature = sample->temperature.mkelvin;
if (depth || lastdepth)
- lastindex = i+2;
+ lastindex = i + pi_idx;
lastdepth = depth;
if (depth > pi->maxdepth)
pi->maxdepth = depth;
}
-
+ entry = pi->entry + i + pi_idx;
+ /* are there still unprocessed gas changes? that would be very strange */
+ while (ev) {
+ entry->sec = ev->time.seconds;
+ entry->depth = 0; /* why are there gas changes after the dive is over? */
+ pi_idx++;
+ entry = pi->entry + i + pi_idx;
+ ev = get_next_gaschange(ev->next);
+ }
+ nr = nr_samples + pi_idx - 2;
check_gas_change_events(dive, pi);
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) /* initialize the start pressures */
track_pr[cyl] = pr_track_alloc(dive->cylinder[cyl].start.mbar, -1);
current = track_pr[pi->entry[2].cylinderindex];
- for (i = 0; i < dive->samples; i++) {
- entry = pi->entry + i + 2;
+ for (i = 0; i < nr + 1; i++) {
+ entry = pi->entry + i + 1;
entry->same_cylinder = entry->cylinderindex == cylinderindex;
cylinderindex = entry->cylinderindex;
}
/* finally, do the discrete integration to get the SAC rate equivalent */
current->pressure_time += (entry->sec - (entry-1)->sec) *
- (1 + entry->depth / 10000.0);
+ (1 + (entry->depth + (entry-1)->depth) / 20000.0);
missing_pr |= !SENSOR_PRESSURE(entry);
}
pr_track->end = pr;
}
}
- if (lastdepth)
- lastindex = i + 2;
- /* Fill in the last two entries with empty values but valid times */
- i = dive->samples + 2;
+ /* Fill in the last two entries with empty values but valid times
+ * without creating a false cylinder change event */
+ i = nr + 2;
pi->entry[i].sec = sec + 20;
+ pi->entry[i].same_cylinder = 1;
+ pi->entry[i].cylinderindex = pi->entry[i-1].cylinderindex;
+ INTERPOLATED_PRESSURE(pi->entry + i) = GET_PRESSURE(pi->entry + i - 1);
pi->entry[i+1].sec = sec + 40;
+ pi->entry[i+1].same_cylinder = 1;
+ pi->entry[i+1].cylinderindex = pi->entry[i-1].cylinderindex;
+ INTERPOLATED_PRESSURE(pi->entry + i + 1) = GET_PRESSURE(pi->entry + i - 1);
+ /* the number of actual entries - some computers have lots of
+ * depth 0 samples at the end of a dive, we want to make sure
+ * we have exactly one of them at the end */
pi->nr = lastindex+1;
+ while (pi->nr <= i+2 && pi->entry[pi->nr-1].depth > 0)
+ pi->nr++;
pi->maxtime = pi->entry[lastindex].sec;
- pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
- pi->maxpressure = dive->cylinder[0].start.mbar;
+ /* Analyze_plot_info() will do the sample max pressures,
+ * this handles the manual pressures
+ */
+ pi->maxpressure = 0;
+ for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
+ unsigned int mbar = dive->cylinder[cyl].start.mbar;
+ if (mbar > pi->maxpressure)
+ pi->maxpressure = mbar;
+ }
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]);
+ if (0) /* awesome for debugging - not useful otherwise */
+ dump_pi(pi);
return analyze_plot_info(pi);
}
void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, struct dive *dive)
{
- struct plot_info *pi = create_plot_info(dive);
+ struct plot_info *pi;
+ static struct sample fake[4];
+ struct sample *sample = dive->sample;
+ int nr = dive->samples;
+
+ if (!nr) {
+ int duration = dive->duration.seconds;
+ int maxdepth = dive->maxdepth.mm;
+ sample = fake;
+ fake[1].time.seconds = duration * 0.05;
+ fake[1].depth.mm = maxdepth;
+ fake[2].time.seconds = duration * 0.95;
+ fake[2].depth.mm = maxdepth;
+ fake[3].time.seconds = duration * 1.00;
+ nr = 4;
+ }
+
+ pi = create_plot_info(dive, nr, sample);
cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
- cairo_set_line_width(gc->cr, 2);
+ cairo_set_line_width(gc->cr, 1);
cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
gc->maxx = (drawing_area->width - 2*drawing_area->x);
gc->maxy = (drawing_area->height - 2*drawing_area->y);
+ /* 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);
-
- /* Depth profile */
- plot_depth_profile(gc, pi);
- plot_events(gc, pi, dive);
+ plot_cylinder_pressure(gc, pi, dive);
/* Text on top of all graphs.. */
plot_temperature_text(gc, pi);
gc->leftx = 0; gc->rightx = 1.0;
gc->topy = 0; gc->bottomy = 1.0;
- set_source_rgb(gc, 1, 1, 1);
+ set_source_rgba(gc, BOUNDING_BOX);
+ cairo_set_line_width(gc->cr, 1);
move_to(gc, 0, 0);
line_to(gc, 0, 1);
line_to(gc, 1, 1);
projects / ext / subsurface.git / blobdiff