#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 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,
+
+ /* Velocity colors. Order is still important, ref VELOCITY_COLORS_START_IDX. */
+ VELO_STABLE, VELO_SLOW, VELO_MODERATE, VELO_FAST, VELO_CRAZY,
-/* 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},
+ /* 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, BACKGROUND);
+}
+
+void pattern_add_color_stop_rgba(struct graphics_context *gc, cairo_pattern_t *pat, double o, color_indice_t c)
{
- set_source_rgba(gc, r, g, b, 1);
+ 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))
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"
- " temperature:%d depth:%d smoothed:%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");
}
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;
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);
{
double deg;
const char *unit;
- static const text_render_options_t tro = {12, 0.6, 0.6, 1.0, LEFT, TOP};
+ static const text_render_options_t tro = {12, TEMP_TEXT, LEFT, TOP};
deg = get_temp_units(mkelvin, &unit);
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 void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
const char *unit;
pressure = get_pressure_units(mbar, &unit);
- text_render_options_t tro = {10, 0.2, 1.0, 0.2, xalign, yalign};
+ text_render_options_t tro = {10, PRESSURE_TEXT, xalign, yalign};
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
}
-#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
-
static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
{
int i;
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;
}
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];
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 */
- entry->sec = ev->time.seconds;
- (entry+1)->sec = ev->time.seconds + 1;
+ 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 -
}
/* 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);
}
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]);
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