#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <string.h>
#include <time.h>
#include "dive.h"
int selected_dive = 0;
+/*
+ * Cairo scaling really is horribly horribly mis-designed.
+ *
+ * Which is sad, because I really like Cairo otherwise. But
+ * the fact that the line width is scaled with the same scale
+ * as the coordinate system is a f*&%ing disaster. So we
+ * can't use it, and instead have this butt-ugly wrapper thing..
+ */
+struct graphics_context {
+ cairo_t *cr;
+ double maxx, maxy;
+ double leftx, rightx;
+ double topy, bottomy;
+};
+
+/* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
+struct plot_info {
+ int nr;
+ int maxtime;
+ struct plot_data {
+ int sec;
+ int val;
+ int smoothed;
+ struct plot_data *min[3];
+ struct plot_data *max[3];
+ int avg[3];
+ } entry[];
+};
+#define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
+
+/* Scale to 0,0 -> maxx,maxy */
+#define SCALEX(gc,x) (((x)-gc->leftx)/(gc->rightx-gc->leftx)*gc->maxx)
+#define SCALEY(gc,y) (((y)-gc->topy)/(gc->bottomy-gc->topy)*gc->maxy)
+#define SCALE(gc,x,y) SCALEX(gc,x),SCALEY(gc,y)
+
+static void move_to(struct graphics_context *gc, double x, double y)
+{
+ cairo_move_to(gc->cr, SCALE(gc, x, y));
+}
+
+static void line_to(struct graphics_context *gc, double x, double y)
+{
+ cairo_line_to(gc->cr, SCALE(gc, x, y));
+}
+
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
/*
}
typedef struct {
+ int size;
double r,g,b;
- enum {CENTER,LEFT} allign;
+ enum {CENTER,LEFT} halign;
+ enum {MIDDLE,TOP,BOTTOM} valign;
} text_render_options_t;
-static void plot_text(cairo_t *cr, text_render_options_t *tro,
+static void plot_text(struct graphics_context *gc, const text_render_options_t *tro,
double x, double y, const char *fmt, ...)
{
+ cairo_t *cr = gc->cr;
cairo_text_extents_t extents;
+ double dx, dy;
char buffer[80];
va_list args;
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
+ cairo_set_font_size(cr, tro->size);
cairo_text_extents(cr, buffer, &extents);
+ dx = 0;
+ switch (tro->halign) {
+ case CENTER:
+ dx = -(extents.width/2 + extents.x_bearing);
+ break;
+ case LEFT:
+ dx = 0;
+ break;
+ }
+ switch (tro->valign) {
+ case TOP:
+ dy = extents.height * 1.2;
+ break;
+ case BOTTOM:
+ dy = -extents.height * 0.8;
+ break;
+ case MIDDLE:
+ dy = 0;
+ break;
+ }
- if (tro->allign == CENTER)
- x -= extents.width/2 + extents.x_bearing;
- y += extents.height * 1.2;
+ move_to(gc, x, y);
+ cairo_rel_move_to(cr, dx, dy);
- cairo_move_to(cr, x, y);
cairo_text_path(cr, buffer);
cairo_set_source_rgb(cr, 0, 0, 0);
cairo_stroke(cr);
- cairo_move_to(cr, x, y);
+ move_to(gc, x, y);
+ cairo_rel_move_to(cr, dx, dy);
+
cairo_set_source_rgb(cr, tro->r, tro->g, tro->b);
cairo_show_text(cr, buffer);
}
-/*
- * Find the next maximum point in a 10-minute window.
- *
- * We exit early if we hit "enough" of a depth reversal,
- * which is roughly 10 feet.
- */
-static struct sample *next_minmax(struct dive *dive, struct sample *sample, struct sample *end, int minmax)
+static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro)
{
- const int enough = 3000;
- struct sample *result;
- int timelimit, depthlimit;
+ int sec = entry->sec;
+ depth_t depth = { entry->val };
+ const char *fmt;
+ double d;
- if (sample >= end)
- return 0;
+ 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);
+}
- timelimit = 24*60*60;
- depthlimit = sample->depth.mm;
- result = NULL;
+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};
+ int i;
- for (;;) {
- int time, depth;
+ for (i = 0; i < pi->nr; i++) {
+ struct plot_data *entry = pi->entry + i;
- sample++;
- if (sample >= end)
- return NULL;
- time = sample->time.seconds;
- depth = sample->depth.mm;
- if (time > timelimit)
- break;
+ if (entry->val < 2000)
+ continue;
- if (minmax) {
- if (depth <= depthlimit) {
- if (depthlimit - depth > enough)
- break;
- continue;
- }
- } else {
- if (depth >= depthlimit) {
- if (depth - depthlimit > enough)
- break;
- continue;
- }
- }
+ if (entry == entry->max[2])
+ render_depth_sample(gc, entry, &deep);
- result = sample;
- depthlimit = depth;
- /* Look up to ten minutes into the future */
- timelimit = time + 600;
+ if (entry == entry->min[2])
+ render_depth_sample(gc, entry, &shallow);
}
- return result;
}
-/* Scale to 0,0 -> maxx,maxy */
-#define SCALE(x,y) (x)*maxx/scalex,(y)*maxy/scaley
-
-static void plot_depth_text(struct dive *dive, cairo_t *cr,
- double maxx, double maxy)
+static void plot_depth_text(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
{
- struct sample *sample, *end;
- double scalex, scaley;
int maxtime, maxdepth;
/* Get plot scaling limits */
maxtime = round_seconds_up(dive->duration.seconds);
maxdepth = round_depth_up(dive->maxdepth);
- scalex = maxtime;
- scaley = maxdepth;
+ gc->leftx = 0; gc->rightx = maxtime;
+ gc->topy = 0; gc->bottomy = maxdepth;
- cairo_set_font_size(cr, 14);
- cairo_set_source_rgb(cr, 1, 0.2, 0.2);
+ plot_text_samples(gc, pi);
+}
- /*
- * We never take the last sample into account.
- * It should be a surface event anyway, although
- * there are buggy cases where it isn't..
- */
- sample = dive->sample;
- end = dive->sample + dive->samples - 1;
-
- while ((sample = next_minmax(dive, sample, end, 1)) != NULL) {
- 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;
- }
+static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info *pi)
+{
+ int i;
+ struct plot_data *entry = pi->entry;
- plot_text(cr, &tro, SCALE(sec, depth.mm), fmt, d);
- sample = next_minmax(dive, sample, end, 0);
- if (!sample)
- break;
+ cairo_set_source_rgba(gc->cr, 1, 0.2, 0.2, 0.20);
+ move_to(gc, entry->sec, entry->smoothed);
+ for (i = 1; i < pi->nr; i++) {
+ entry++;
+ line_to(gc, entry->sec, entry->smoothed);
+ }
+ cairo_stroke(gc->cr);
+}
+
+static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi,
+ int index, double a)
+{
+ int i;
+ struct plot_data *entry = pi->entry;
+
+ cairo_set_source_rgba(gc->cr, 1, 0.2, 1, a);
+ move_to(gc, entry->sec, entry->min[index]->val);
+ for (i = 1; i < pi->nr; i++) {
+ entry++;
+ line_to(gc, entry->sec, entry->min[index]->val);
+ }
+ for (i = 1; i < pi->nr; i++) {
+ line_to(gc, entry->sec, entry->max[index]->val);
+ entry--;
}
+ cairo_close_path(gc->cr);
+ cairo_fill(gc->cr);
}
-static void plot_depth_profile(struct dive *dive, cairo_t *cr,
- double maxx, double maxy)
+static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
{
- double scalex, scaley;
+ 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);
+}
+
+static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
+{
+ int i;
+ cairo_t *cr = gc->cr;
int begins, sec, depth;
- int i, samples;
- struct sample *sample;
+ struct plot_data *entry;
int maxtime, maxdepth, marker;
- samples = dive->samples;
- if (!samples)
- return;
-
- cairo_set_line_width(cr, 2);
+ cairo_set_line_width(gc->cr, 2);
/* Get plot scaling limits */
maxtime = round_seconds_up(dive->duration.seconds);
maxdepth = round_depth_up(dive->maxdepth);
/* Time markers: every 5 min */
- scalex = maxtime;
- scaley = 1.0;
+ gc->leftx = 0; gc->rightx = maxtime;
+ gc->topy = 0; gc->bottomy = 1.0;
for (i = 5*60; i < maxtime; i += 5*60) {
- cairo_move_to(cr, SCALE(i, 0));
- cairo_line_to(cr, SCALE(i, 1));
+ move_to(gc, i, 0);
+ line_to(gc, i, 1);
}
/* Depth markers: every 30 ft or 10 m*/
- scalex = 1.0;
- scaley = maxdepth;
+ gc->leftx = 0; gc->rightx = 1.0;
+ gc->topy = 0; gc->bottomy = maxdepth;
switch (output_units.length) {
case METERS: marker = 10000; break;
case FEET: marker = 9144; break; /* 30 ft */
cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
for (i = marker; i < maxdepth; i += marker) {
- cairo_move_to(cr, SCALE(0, i));
- cairo_line_to(cr, SCALE(1, i));
+ move_to(gc, 0, i);
+ line_to(gc, 1, i);
}
cairo_stroke(cr);
/* Show mean depth */
cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
- cairo_move_to(cr, SCALE(0, dive->meandepth.mm));
- cairo_line_to(cr, SCALE(1, dive->meandepth.mm));
+ move_to(gc, 0, dive->meandepth.mm);
+ line_to(gc, 1, dive->meandepth.mm);
cairo_stroke(cr);
- scalex = maxtime;
+ gc->leftx = 0; gc->rightx = maxtime;
+
+ plot_smoothed_profile(gc, pi);
+ plot_minmax_profile(gc, pi);
- sample = dive->sample;
+ entry = pi->entry;
cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
- begins = sample->time.seconds;
- cairo_move_to(cr, SCALE(sample->time.seconds, sample->depth.mm));
- for (i = 1; i < dive->samples; i++) {
- sample++;
- sec = sample->time.seconds;
+ begins = entry->sec;
+ move_to(gc, entry->sec, entry->val);
+ for (i = 1; i < pi->nr; i++) {
+ entry++;
+ sec = entry->sec;
if (sec <= maxtime) {
- depth = sample->depth.mm;
- cairo_line_to(cr, SCALE(sec, depth));
+ depth = entry->val;
+ line_to(gc, sec, depth);
}
}
- scaley = 1.0;
- cairo_line_to(cr, SCALE(MIN(sec,maxtime), 0));
- cairo_line_to(cr, SCALE(begins, 0));
+ gc->topy = 0; gc->bottomy = 1.0;
+ line_to(gc, MIN(sec,maxtime), 0);
+ line_to(gc, begins, 0);
cairo_close_path(cr);
cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
cairo_fill_preserve(cr);
cairo_stroke(cr);
}
+static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc)
+{
+ int i;
+ cairo_t *cr = gc->cr;
+ int begins = 0, sec = 0;
+ int maxtime, mintemp, maxtemp;
+
+ /* Get plot scaling limits */
+ maxtime = round_seconds_up(dive->duration.seconds);
+ mintemp = INT_MAX;
+ maxtemp = 0;
+ for (i = 0; i < dive->samples; i++) {
+ struct sample *sample = dive->sample+i;
+ int mkelvin = sample->temperature.mkelvin;
+ if (!mkelvin)
+ continue;
+ if (!begins) {
+ begins = mkelvin;
+ sec = sample->time.seconds;
+ }
+ if (mkelvin > maxtemp)
+ maxtemp = mkelvin;
+ if (mkelvin < mintemp)
+ mintemp = mkelvin;
+ }
+ if (mintemp >= maxtemp)
+ return;
+
+ gc->leftx = 0; gc->rightx = maxtime;
+ /* Show temperatures in roughly the lower third */
+ gc->topy = maxtemp + (maxtemp - mintemp)*2;
+ gc->bottomy = mintemp - (maxtemp - mintemp)/2;
+
+ cairo_set_source_rgba(cr, 0.2, 0.2, 1.0, 0.8);
+ move_to(gc, sec, begins);
+ for (i = 0; i < dive->samples; i++) {
+ struct sample *sample = dive->sample+i;
+ int mkelvin = sample->temperature.mkelvin;
+ if (!mkelvin)
+ mkelvin = begins;
+ line_to(gc, sample->time.seconds, mkelvin);
+ begins = mkelvin;
+ }
+ cairo_stroke(cr);
+}
+
/* gets both the actual start and end pressure as well as the scaling factors */
-static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley,
- pressure_t *startp, pressure_t *endp)
+static int get_cylinder_pressure_range(struct dive *dive, struct graphics_context *gc,
+ pressure_t *startp, pressure_t *endp)
{
int i;
int min, max;
- *scalex = round_seconds_up(dive->duration.seconds);
+ gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
max = 0;
min = 5000000;
endp->mbar = min;
if (!max)
return 0;
- *scaley = max * 1.5;
+ gc->topy = 0; gc->bottomy = max * 1.5;
return 1;
}
-static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
- double maxx, double maxy)
+static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc)
{
int i, sec = -1;
- double scalex, scaley;
- if (!get_cylinder_pressure_range(dive, &scalex, &scaley, NULL, NULL))
+ if (!get_cylinder_pressure_range(dive, gc, NULL, NULL))
return;
- cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
+ cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
- cairo_move_to(cr, SCALE(0, dive->cylinder[0].start.mbar));
+ move_to(gc, 0, dive->cylinder[0].start.mbar);
for (i = 1; i < dive->samples; i++) {
int mbar;
struct sample *sample = dive->sample + i;
continue;
sec = sample->time.seconds;
if (sec <= dive->duration.seconds)
- cairo_line_to(cr, SCALE(sec, mbar));
+ line_to(gc, sec, mbar);
}
/*
* We may have "surface time" events, in which case we don't go
* back to dive duration
*/
if (sec < dive->duration.seconds)
- cairo_line_to(cr, SCALE(dive->duration.seconds, dive->cylinder[0].end.mbar));
- cairo_stroke(cr);
+ line_to(gc, dive->duration.seconds, dive->cylinder[0].end.mbar);
+ cairo_stroke(gc->cr);
}
/*
return airuse;
}
-static void plot_info(struct dive *dive, cairo_t *cr,
- double maxx, double maxy)
+static void plot_info(struct dive *dive, struct graphics_context *gc)
{
- text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
+ text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
const double liters_per_cuft = 28.317;
- const char *unit;
+ const char *unit, *desc;
double airuse;
airuse = calculate_airuse(dive);
airuse /= liters_per_cuft;
break;
}
- plot_text(cr, &tro, maxx*0.8, maxy*0.8, "vol: %4.2f %s", airuse, unit);
+ plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit);
if (dive->duration.seconds) {
double pressure = 1 + (dive->meandepth.mm / 10000.0);
double sac = airuse / pressure * 60 / dive->duration.seconds;
- plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f %s/min", sac, unit);
+ plot_text(gc, &tro, 0.8, 0.85, "SAC: %4.2f %s/min", sac, unit);
+ }
+ desc = dive->cylinder[0].type.description;
+ if (desc || dive->cylinder[0].gasmix.o2.permille) {
+ int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
+ if (!desc)
+ desc = "";
+ if (!o2)
+ o2 = 21;
+ plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
}
}
-static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
- double maxx, double maxy)
+static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
{
- double scalex, scaley;
pressure_t startp, endp;
- cairo_set_font_size(cr, 10);
-
- if (get_cylinder_pressure_range(dive, &scalex, &scaley,
- &startp, &endp)) {
+ if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) {
int start, end;
const char *unit = "bar";
break;
}
- text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
- plot_text(cr, &tro, SCALE(0, startp.mbar), "%d %s", start, unit);
- plot_text(cr, &tro, SCALE(dive->duration.seconds, endp.mbar),
+ text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
+ plot_text(gc, &tro, 0, startp.mbar, "%d %s", start, unit);
+ plot_text(gc, &tro, dive->duration.seconds, endp.mbar,
"%d %s", end, unit);
}
}
-static void plot(cairo_t *cr, int w, int h, struct dive *dive)
+static void analyze_plot_info_minmax_minute(struct plot_data *entry, struct plot_data *first, struct plot_data *last, int index)
+{
+ struct plot_data *p = entry;
+ int time = entry->sec;
+ int seconds = 90*(index+1);
+ struct plot_data *min, *max;
+ int avg, nr;
+
+ /* Go back 'seconds' in time */
+ while (p > first) {
+ if (p[-1].sec < time - seconds)
+ break;
+ p--;
+ }
+
+ /* Then go forward until we hit an entry past the time */
+ min = max = p;
+ avg = p->val;
+ nr = 1;
+ while (++p < last) {
+ int val = p->val;
+ if (p->sec > time + seconds)
+ break;
+ avg += val;
+ nr ++;
+ if (val < min->val)
+ min = p;
+ if (val > max->val)
+ max = p;
+ }
+ entry->min[index] = min;
+ entry->max[index] = max;
+ entry->avg[index] = (avg + nr/2) / nr;
+}
+
+static void analyze_plot_info_minmax(struct plot_data *entry, struct plot_data *first, struct plot_data *last)
{
- double topx, topy, maxx, maxy;
- double scalex, scaley;
+ analyze_plot_info_minmax_minute(entry, first, last, 0);
+ analyze_plot_info_minmax_minute(entry, first, last, 1);
+ analyze_plot_info_minmax_minute(entry, first, last, 2);
+}
+
+static struct plot_info *analyze_plot_info(struct plot_info *pi)
+{
+ int i;
+ int nr = pi->nr;
+
+ /* Smoothing function: 5-point triangular smooth */
+ for (i = 2; i < nr-2; i++) {
+ struct plot_data *entry = pi->entry+i;
+ int val;
+
+ val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val;
+ entry->smoothed = (val+4) / 9;
+ }
+
+ /* One-, two- and three-minute minmax data */
+ for (i = 0; i < nr; i++) {
+ struct plot_data *entry = pi->entry +i;
+ analyze_plot_info_minmax(entry, pi->entry, pi->entry+nr);
+ }
+
+ return pi;
+}
+
+/*
+ * Create a plot-info with smoothing and ranged min/max
+ *
+ * This also makes sure that we have extra empty events on both
+ * sides, so that you can do end-points without having to worry
+ * about it.
+ */
+static struct plot_info *depth_plot_info(struct dive *dive)
+{
+ int i, nr = dive->samples + 4, sec;
+ size_t alloc_size = plot_info_size(nr);
+ struct plot_info *pi;
+
+ pi = malloc(alloc_size);
+ if (!pi)
+ return pi;
+ memset(pi, 0, alloc_size);
+ pi->nr = nr;
+ sec = 0;
+ for (i = 0; i < dive->samples; i++) {
+ struct sample *sample = dive->sample+i;
+ struct plot_data *entry = pi->entry + i + 2;
+
+ sec = entry->sec = sample->time.seconds;
+ entry->val = sample->depth.mm;
+ }
+ /* Fill in the last two entries with empty values but valid times */
+ i = dive->samples + 2;
+ pi->entry[i].sec = sec + 20;
+ pi->entry[i+1].sec = sec + 40;
+
+ return analyze_plot_info(pi);
+}
+
+static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
+{
+ double topx, topy;
+ struct plot_info *pi = depth_plot_info(dive);
topx = w / 20.0;
topy = h / 20.0;
- maxx = (w - 2*topx);
- maxy = (h - 2*topy);
- cairo_translate(cr, topx, topy);
+ cairo_translate(gc->cr, topx, topy);
+
+ /*
+ * We can use "cairo_translate()" because that doesn't
+ * scale line width etc. But the actual scaling we need
+ * do set up ourselves..
+ *
+ * Snif. What a pity.
+ */
+ gc->maxx = (w - 2*topx);
+ gc->maxy = (h - 2*topy);
/* Cylinder pressure plot */
- plot_cylinder_pressure(dive, cr, maxx, maxy);
+ plot_cylinder_pressure(dive, gc);
/* Depth profile */
- plot_depth_profile(dive, cr, maxx, maxy);
+ plot_depth_profile(dive, gc, pi);
+
+ /* Temperature profile */
+ plot_temperature_profile(dive, gc);
/* Text on top of all graphs.. */
- plot_depth_text(dive, cr, maxx, maxy);
- plot_cylinder_pressure_text(dive, cr, maxx, maxy);
+ plot_depth_text(dive, gc, pi);
+ plot_cylinder_pressure_text(dive, gc);
/* And info box in the lower right corner.. */
- plot_info(dive, cr, maxx, maxy);
+ gc->leftx = 0; gc->rightx = 1.0;
+ gc->topy = 0; gc->bottomy = 1.0;
+ plot_info(dive, gc);
/* Bounding box last */
- scalex = scaley = 1.0;
- cairo_set_source_rgb(cr, 1, 1, 1);
- cairo_move_to(cr, SCALE(0,0));
- cairo_line_to(cr, SCALE(0,1));
- cairo_line_to(cr, SCALE(1,1));
- cairo_line_to(cr, SCALE(1,0));
- cairo_close_path(cr);
- cairo_stroke(cr);
+ cairo_set_source_rgb(gc->cr, 1, 1, 1);
+ move_to(gc, 0, 0);
+ line_to(gc, 0, 1);
+ line_to(gc, 1, 1);
+ line_to(gc, 1, 0);
+ cairo_close_path(gc->cr);
+ cairo_stroke(gc->cr);
}
static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
struct dive *dive = current_dive;
- cairo_t *cr;
+ struct graphics_context gc;
int w,h;
w = widget->allocation.width;
h = widget->allocation.height;
- cr = gdk_cairo_create(widget->window);
- cairo_set_source_rgb(cr, 0, 0, 0);
- cairo_paint(cr);
+ gc.cr = gdk_cairo_create(widget->window);
+ cairo_set_source_rgb(gc.cr, 0, 0, 0);
+ cairo_paint(gc.cr);
if (dive)
- plot(cr, w, h, dive);
+ plot(&gc, w, h, dive);
- cairo_destroy(cr);
+ cairo_destroy(gc.cr);
return FALSE;
}
GtkWidget *da;
da = gtk_drawing_area_new();
- gtk_widget_set_size_request(da, 450, 350);
+ gtk_widget_set_size_request(da, 350, 250);
g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
return da;