X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=6f19902026e48bef55fcfec7c14b6e16cb759ce9;hb=b72ade0e78825dd97add4c7607c574df351abed0;hp=a56b7641fc2fefd3e41e33e8c4c3ac35e5fc5ed8;hpb=60a62cf84392233445c8974ef2dc1d2c01307935;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index a56b764..6f19902 100644
--- a/profile.c
+++ b/profile.c
@@ -1,3 +1,7 @@
+/* profile.c */
+/* creates all the necessary data for drawing the dive profile 
+ * uses cairo to draw it
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -10,12 +14,15 @@
 
 int selected_dive = 0;
 
-/* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
+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 mintemp, maxtemp;
 	struct plot_data {
 		int sec;
@@ -23,11 +30,23 @@ struct plot_info {
 		/* Depth info */
 		int val;
 		int smoothed;
+		velocity_t velocity;
 		struct plot_data *min[3];
 		struct plot_data *max[3];
 		int avg[3];
 	} entry[];
 };
+
+/* 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},
+};
+
 #define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
 
 /* Scale to 0,0 -> maxx,maxy */
@@ -47,18 +66,21 @@ static void line_to(struct graphics_context *gc, double x, double y)
 
 static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
 {
+	/*
+	 * For printers, we still honor 'a', but ignore colors
+	 * for now. Black is white and white is black
+	 */
 	if (gc->printer) {
-		/* Black is white and white is black */
 		double sum = r+g+b;
-		if (sum > 2)
+		if (sum > 0.8)
 			r = g = b = 0;
-		else if (sum < 1)
+		else
 			r = g = b = 1;
 	}
 	cairo_set_source_rgba(gc->cr, r, g, b, a);
 }
 
-static void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
+void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
 {
 	set_source_rgba(gc, r, g, b, 1);
 }
@@ -70,31 +92,42 @@ static void set_source_rgb(struct graphics_context *gc, double r, double g, doub
  * current dive. However, we don't scale past less than
  * 30 minutes or 90 ft, just so that small dives show
  * up as such.
+ * we also need to add 180 seconds at the end so the min/max
+ * plots correctly
  */
 static int get_maxtime(struct plot_info *pi)
 {
 	int seconds = pi->maxtime;
-	return MAX(30*60, ROUND_UP(seconds, 60*10));
+	/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
+	return MAX(30*60, ROUND_UP(seconds+150, 60*5));
 }
 
 static int get_maxdepth(struct plot_info *pi)
 {
 	unsigned mm = pi->maxdepth;
-	/* Minimum 30m */
+	/* Minimum 30m, rounded up to 10m, with at least 3m to spare */
 	return MAX(30000, ROUND_UP(mm+3000, 10000));
 }
 
 typedef struct {
 	int size;
 	double r,g,b;
-	enum {CENTER,LEFT} halign;
-	enum {MIDDLE,TOP,BOTTOM} valign;
+	double hpos, vpos;
 } text_render_options_t;
 
+#define RIGHT (-1.0)
+#define CENTER (-0.5)
+#define LEFT (0.0)
+
+#define TOP (1)
+#define MIDDLE (0)
+#define BOTTOM (-1)
+
 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_font_extents_t fe;
 	cairo_text_extents_t extents;
 	double dx, dy;
 	char buffer[80];
@@ -105,27 +138,10 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 	va_end(args);
 
 	cairo_set_font_size(cr, tro->size);
+	cairo_font_extents(cr, &fe);
 	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;
-	}
+	dx = tro->hpos * extents.width + extents.x_bearing;
+	dy = tro->vpos * extents.height + fe.descent;
 
 	move_to(gc, x, y);
 	cairo_rel_move_to(cr, dx, dy);
@@ -141,24 +157,41 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 	cairo_show_text(cr, buffer);
 }
 
+static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, struct event *event, const text_render_options_t *tro)
+{
+	int i, depth = 0;
+
+	for (i = 0; i < pi->nr; i++) {
+		struct plot_data *data = pi->entry + i;
+		if (event->time.seconds < data->sec)
+			break;
+		depth = data->val;
+	}
+	plot_text(gc, tro, event->time.seconds, depth, "%s", event->name);
+}
+
+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};
+	struct event *event = dive->events;
+
+	if (gc->printer)
+		return;
+
+	while (event) {
+		plot_one_event(gc, pi, event, &tro);
+		event = event->next;
+	}
+}
+
 static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro)
 {
-	int sec = entry->sec;
-	depth_t depth = { entry->val };
-	const char *fmt;
+	int sec = entry->sec, decimals;
 	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;
-	}
-	plot_text(gc, tro, sec, depth.mm, fmt, d);
+	d = get_depth_units(entry->val, &decimals, NULL);
+
+	plot_text(gc, tro, sec, entry->val, "%.*f", decimals, d);
 }
 
 static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
@@ -200,7 +233,7 @@ static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info
 	int i;
 	struct plot_data *entry = pi->entry;
 
-	cairo_set_source_rgba(gc->cr, 1, 0.2, 0.2, 0.20);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
 	move_to(gc, entry->sec, entry->smoothed);
 	for (i = 1; i < pi->nr; i++) {
 		entry++;
@@ -215,7 +248,7 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_
 	int i;
 	struct plot_data *entry = pi->entry;
 
-	cairo_set_source_rgba(gc->cr, 1, 0.2, 1, a);
+	set_source_rgba(gc, 1, 0.2, 1, a);
 	move_to(gc, entry->sec, entry->min[index]->val);
 	for (i = 1; i < pi->nr; i++) {
 		entry++;
@@ -242,7 +275,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 {
 	int i;
 	cairo_t *cr = gc->cr;
-	int begins, sec, depth;
+	int sec, depth;
 	struct plot_data *entry;
 	int maxtime, maxdepth, marker;
 
@@ -274,41 +307,64 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 	cairo_stroke(cr);
 
 	/* Show mean depth */
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
-	move_to(gc, 0, pi->meandepth);
-	line_to(gc, 1, pi->meandepth);
-	cairo_stroke(cr);
+	if (! gc->printer) {
+		set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
+		move_to(gc, 0, pi->meandepth);
+		line_to(gc, 1, pi->meandepth);
+		cairo_stroke(cr);
+	}
 
 	gc->leftx = 0; gc->rightx = maxtime;
 
-	plot_smoothed_profile(gc, pi);
-	plot_minmax_profile(gc, pi);
+	/*
+	 * These are good for debugging text placement etc,
+	 * but not for actual display..
+	 */
+	if (0) {
+		plot_smoothed_profile(gc, pi);
+		plot_minmax_profile(gc, pi);
+	}
 
-	entry = pi->entry;
 	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	begins = entry->sec;
-	move_to(gc, entry->sec, entry->val);
+
+	/* 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);
+
+	entry = pi->entry;
+	move_to(gc, 0, 0);
+	for (i = 0; i < pi->nr; i++, entry++)
+		line_to(gc, entry->sec, entry->val);
+	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 */
+	entry = pi->entry;
 	for (i = 1; i < pi->nr; i++) {
 		entry++;
 		sec = entry->sec;
-		if (sec <= maxtime) {
-			depth = entry->val;
-			line_to(gc, sec, depth);
-		}
+		/* 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->val;
+		set_source_rgb(gc, color.r, color.g, color.b);
+		move_to(gc, entry[-1].sec, entry[-1].val);
+		line_to(gc, sec, depth);
+		cairo_stroke(cr);
 	}
-	gc->topy = 0; gc->bottomy = 1.0;
-	line_to(gc, MIN(sec,maxtime), 0);
-	line_to(gc, begins, 0);
-	cairo_close_path(cr);
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
-	cairo_fill_preserve(cr);
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	cairo_stroke(cr);
 }
 
 static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
 {
-	int maxtime, mintemp, maxtemp;
+	int maxtime, mintemp, maxtemp, delta;
 
 	/* Get plot scaling limits */
 	maxtime = get_maxtime(pi);
@@ -316,9 +372,16 @@ static int setup_temperature_limits(struct graphics_context *gc, struct plot_inf
 	maxtemp = pi->maxtemp;
 
 	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;
+	/* Show temperatures in roughly the lower third, but make sure the scale
+	   is at least somewhat reasonable */
+	delta = maxtemp - mintemp;
+	if (delta > 3000) { /* more than 3K in fluctuation */
+		gc->topy = maxtemp + delta*2;
+		gc->bottomy = mintemp - delta/2;
+	} else {
+		gc->topy = maxtemp + 1500 + delta*2;
+		gc->bottomy = mintemp - delta/2;
+	}
 
 	return maxtemp > mintemp;
 }
@@ -332,12 +395,12 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
 
 	if (output_units.temperature == FAHRENHEIT) {
 		deg = to_F(temperature);
-		unit = "F";
+		unit = UTF8_DEGREE "F";
 	} else {
 		deg = to_C(temperature);
-		unit = "C";
+		unit = UTF8_DEGREE "C";
 	}
-	plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+	plot_text(gc, &tro, sec, temperature.mkelvin, "%d%s", deg, unit);
 }
 
 static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
@@ -402,18 +465,19 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
 	gc->leftx = 0;
 	gc->rightx = get_maxtime(pi);
 
-	gc->topy = 0; gc->bottomy = pi->maxpressure * 1.5;
+	gc->bottomy = 0; gc->topy = pi->maxpressure * 1.5;
 	return pi->maxpressure != 0;
 }
 
 static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
 {
 	int i;
+	int have_pressure = FALSE;
 
 	if (!get_cylinder_pressure_range(gc, pi))
 		return;
 
-	cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
+	set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
 
 	move_to(gc, 0, pi->maxpressure);
 	for (i = 1; i < pi->nr; i++) {
@@ -423,74 +487,18 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 		mbar = entry->pressure;
 		if (!mbar)
 			continue;
+		have_pressure = TRUE;
 		line_to(gc, entry->sec, mbar);
 	}
-	line_to(gc, pi->maxtime, pi->minpressure);
+	/* if we have valid samples, we don't want to draw a line to the minpressure
+	 * but just end wherever the dive ended (think valve shutdowns during dive)
+	 * but that doesn't work so well if we have only max and min
+	 */
+	if (! have_pressure)
+		line_to(gc, pi->maxtime, pi->minpressure);
 	cairo_stroke(gc->cr);
 }
 
-/*
- * Return air usage (in liters).
- */
-static double calculate_airuse(struct dive *dive)
-{
-	double airuse = 0;
-	int i;
-
-	for (i = 0; i < MAX_CYLINDERS; i++) {
-		cylinder_t *cyl = dive->cylinder + i;
-		int size = cyl->type.size.mliter;
-		double kilo_atm;
-
-		if (!size)
-			continue;
-
-		kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
-
-		/* Liters of air at 1 atm == milliliters at 1k atm*/
-		airuse += kilo_atm * size;
-	}
-	return airuse;
-}
-
-static void plot_info(struct dive *dive, struct graphics_context *gc)
-{
-	text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
-	const double liters_per_cuft = 28.317;
-	const char *unit, *desc;
-	double airuse;
-
-	airuse = calculate_airuse(dive);
-	if (!airuse)
-		return;
-
-	/* I really need to start addign some unit setting thing */
-	switch (output_units.volume) {
-	case LITER:
-		unit = "l";
-		break;
-	case CUFT:
-		unit = "cuft";
-		airuse /= liters_per_cuft;
-		break;
-	}
-	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(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 int mbar_to_PSI(int mbar)
 {
 	pressure_t p = {mbar};
@@ -506,24 +514,24 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 		switch (output_units.pressure) {
 		case PASCAL:
 			start = pi->maxpressure * 100;
-			end = pi->minpressure * 100;
+			end = pi->endpressure * 100;
 			unit = "pascal";
 			break;
 		case BAR:
 			start = (pi->maxpressure + 500) / 1000;
-			end = (pi->minpressure + 500) / 1000;
+			end = (pi->endpressure + 500) / 1000;
 			unit = "bar";
 			break;
 		case PSI:
 			start = mbar_to_PSI(pi->maxpressure);
-			end = mbar_to_PSI(pi->minpressure);
+			end = mbar_to_PSI(pi->endpressure);
 			unit = "psi";
 			break;
 		}
 
 		text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
 		plot_text(gc, &tro, 0, pi->maxpressure, "%d %s", start, unit);
-		plot_text(gc, &tro, pi->maxtime, pi->minpressure,
+		plot_text(gc, &tro, pi->maxtime, pi->endpressure,
 			  "%d %s", end, unit);
 	}
 }
@@ -570,6 +578,33 @@ static void analyze_plot_info_minmax(struct plot_data *entry, struct plot_data *
 	analyze_plot_info_minmax_minute(entry, first, last, 2);
 }
 
+static velocity_t velocity(int speed)
+{
+	velocity_t v;
+
+	if (speed < -304) /* ascent faster than -60ft/min */
+		v = CRAZY;
+	else if (speed < -152) /* above -30ft/min */
+		v = FAST;
+	else if (speed < -76) /* -15ft/min */
+		v = MODERATE;
+	else if (speed < -25) /* -5ft/min */
+		v = SLOW;
+	else if (speed < 25) /* very hard to find data, but it appears that the recommendations
+				for descent are usually about 2x ascent rate; still, we want 
+				stable to mean stable */
+		v = STABLE;
+	else if (speed < 152) /* between 5 and 30ft/min is considered slow */
+		v = SLOW;
+	else if (speed < 304) /* up to 60ft/min is moderate */
+		v = MODERATE;
+	else if (speed < 507) /* up to 100ft/min is fast */
+		v = FAST;
+	else /* more than that is just crazy - you'll blow your ears out */
+		v = CRAZY;
+
+	return v;
+}
 static struct plot_info *analyze_plot_info(struct plot_info *pi)
 {
 	int i;
@@ -597,12 +632,28 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 	}
 
 	/* Smoothing function: 5-point triangular smooth */
-	for (i = 2; i < nr-2; i++) {
+	for (i = 2; i < nr; 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;
+		if (i < nr-2) {
+			val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val;
+			entry->smoothed = (val+4) / 9;
+		}
+		/* vertical velocity in mm/sec */
+		/* Linus wants to smooth this - let's at least look at the samples that aren't FAST or CRAZY */
+		if (entry[0].sec - entry[-1].sec) {
+			entry->velocity = velocity((entry[0].val - entry[-1].val) / (entry[0].sec - entry[-1].sec));
+                        /* if our samples are short and we aren't too FAST*/
+			if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) {
+				int past = -2;
+				while (i+past > 0 && entry[0].sec - entry[past].sec < 15)
+					past--;
+				entry->velocity = velocity((entry[0].val - entry[past].val) / 
+							(entry[0].sec - entry[past].sec));
+			}
+		} else
+			entry->velocity = STABLE;
 	}
 
 	/* One-, two- and three-minute minmax data */
@@ -663,7 +714,7 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	pi->nr = lastindex+1;
 	pi->maxtime = pi->entry[lastindex].sec;
 
-	pi->minpressure = dive->cylinder[0].end.mbar;
+	pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
 	pi->maxpressure = dive->cylinder[0].start.mbar;
 
 	pi->meandepth = dive->meandepth.mm;
@@ -671,14 +722,11 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	return analyze_plot_info(pi);
 }
 
-void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
+void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, struct dive *dive)
 {
-	double topx, topy;
 	struct plot_info *pi = create_plot_info(dive);
 
-	topx = w / 20.0;
-	topy = h / 20.0;
-	cairo_translate(gc->cr, topx, topy);
+	cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
 	cairo_set_line_width(gc->cr, 2);
 	cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
 	cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
@@ -690,8 +738,8 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	 *
 	 * Snif. What a pity.
 	 */
-	gc->maxx = (w - 2*topx);
-	gc->maxy = (h - 2*topy);
+	gc->maxx = (drawing_area->width - 2*drawing_area->x);
+	gc->maxy = (drawing_area->height - 2*drawing_area->y);
 
 	/* Temperature profile */
 	plot_temperature_profile(gc, pi);
@@ -701,18 +749,17 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 
 	/* Depth profile */
 	plot_depth_profile(gc, pi);
+	plot_events(gc, pi, dive);
 
 	/* Text on top of all graphs.. */
 	plot_temperature_text(gc, pi);
 	plot_depth_text(gc, pi);
 	plot_cylinder_pressure_text(gc, pi);
 
-	/* And info box in the lower right corner.. */
+	/* Bounding box last */
 	gc->leftx = 0; gc->rightx = 1.0;
 	gc->topy = 0; gc->bottomy = 1.0;
-	plot_info(dive, gc);
 
-	/* Bounding box last */
 	set_source_rgb(gc, 1, 1, 1);
 	move_to(gc, 0, 0);
 	line_to(gc, 0, 1);
@@ -721,36 +768,5 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	cairo_close_path(gc->cr);
 	cairo_stroke(gc->cr);
 
-}
-
-static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	struct dive *dive = current_dive;
-	struct graphics_context gc = { .printer = 0 };
-	int w,h;
-
-	w = widget->allocation.width;
-	h = widget->allocation.height;
-
-	gc.cr = gdk_cairo_create(widget->window);
-	set_source_rgb(&gc, 0, 0, 0);
-	cairo_paint(gc.cr);
-
-	if (dive)
-		plot(&gc, w, h, dive);
-
-	cairo_destroy(gc.cr);
-
-	return FALSE;
-}
-
-GtkWidget *dive_profile_widget(void)
-{
-	GtkWidget *da;
-
-	da = gtk_drawing_area_new();
-	gtk_widget_set_size_request(da, 350, 250);
-	g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
-
-	return da;
+	free(pi);
 }