X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=551918b35518e8cfe2f0e1d8b69cbc62a863e46b;hb=f4559ba9fa4610b56f27ffb20eb872908e987baf;hp=16522db99659e25268a7dde2697f2773ee1e99c0;hpb=bd315a4804cf60123c7016ece084f2593df5101f;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 16522db..551918b 100644
--- a/profile.c
+++ b/profile.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <time.h>
 
 #include "dive.h"
@@ -20,11 +21,29 @@ int selected_dive = 0;
 struct graphics_context {
 	cairo_t *cr;
 	double maxx, maxy;
-	double scalex, scaley;
+	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 SCALE(gc,x,y) (x)*gc->maxx/gc->scalex,(y)*gc->maxy/gc->scaley
+#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)
 {
@@ -113,10 +132,10 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 	cairo_show_text(cr, buffer);
 }
 
-static void render_depth_sample(struct graphics_context *gc, struct sample *sample, const text_render_options_t *tro)
+static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro)
 {
-	int sec = sample->time.seconds;
-	depth_t depth = sample->depth;
+	int sec = entry->sec;
+	depth_t depth = { entry->val };
 	const char *fmt;
 	double d;
 
@@ -133,104 +152,89 @@ static void render_depth_sample(struct graphics_context *gc, struct sample *samp
 	plot_text(gc, tro, sec, depth.mm, fmt, d);
 }
 
-/*
- * Find the next minimum/maximum point.
- *
- * We exit early if we hit "enough" of a depth reversal,
- * which is roughly 10 feet.
- */
-static struct sample *next_minmax(struct sample *sample, struct sample *end, int minmax)
-{
-	const int enough = 3000;
-	struct sample *result;
-	int depthlimit;
-
-	if (sample >= end)
-		return 0;
-
-	depthlimit = sample->depth.mm;
-	result = NULL;
-
-	for (;;) {
-		int time, depth;
-
-		sample++;
-		if (sample >= end)
-			return NULL;
-		time = sample->time.seconds;
-		depth = sample->depth.mm;
-
-		if (minmax) {
-			if (depth <= depthlimit) {
-				if (depthlimit - depth > enough)
-					break;
-				continue;
-			}
-		} else {
-			if (depth >= depthlimit) {
-				if (depth - depthlimit > enough)
-					break;
-				continue;
-			}
-		}
-
-		result = sample;
-		depthlimit = depth;
-	}
-	return result;
-}
-
-static void plot_text_samples(struct graphics_context *gc, struct sample *a, struct sample *b)
+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 (;;) {
-		if (b <= a)
-			break;
-		a = next_minmax(a, b, 1);
-		if (!a)
-			break;
-		render_depth_sample(gc, a, &deep);
-		a = next_minmax(a, b, 0);
-		if (!a)
-			break;
-		if (a->depth.mm < 2500)
+	for (i = 0; i < pi->nr; i++) {
+		struct plot_data *entry = pi->entry + i;
+
+		if (entry->val < 2000)
 			continue;
-		render_depth_sample(gc, a, &shallow);
+
+		if (entry == entry->max[2])
+			render_depth_sample(gc, entry, &deep);
+
+		if (entry == entry->min[2])
+			render_depth_sample(gc, entry, &shallow);
 	}
 }
 
-static void plot_depth_text(struct dive *dive, struct graphics_context *gc)
+static void plot_depth_text(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
 {
-	struct sample *sample, *end;
 	int maxtime, maxdepth;
 
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
 	maxdepth = round_depth_up(dive->maxdepth);
 
-	gc->scalex = maxtime;
-	gc->scaley = maxdepth;
+	gc->leftx = 0; gc->rightx = maxtime;
+	gc->topy = 0; gc->bottomy = maxdepth;
 
-	sample = dive->sample;
-	end = dive->sample + dive->samples;
+	plot_text_samples(gc, pi);
+}
 
-	plot_text_samples(gc, sample, end);
+static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info *pi)
+{
+	int i;
+	struct plot_data *entry = pi->entry;
+
+	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, struct graphics_context *gc)
+static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
 {
+	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(gc->cr, 2);
 
 	/* Get plot scaling limits */
@@ -238,16 +242,16 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc)
 	maxdepth = round_depth_up(dive->maxdepth);
 
 	/* Time markers: every 5 min */
-	gc->scalex = maxtime;
-	gc->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) {
 		move_to(gc, i, 0);
 		line_to(gc, i, 1);
 	}
 
 	/* Depth markers: every 30 ft or 10 m*/
-	gc->scalex = 1.0;
-	gc->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 */
@@ -266,21 +270,24 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc)
 	line_to(gc, 1, dive->meandepth.mm);
 	cairo_stroke(cr);
 
-	gc->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;
-	move_to(gc, 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;
+			depth = entry->val;
 			line_to(gc, sec, depth);
 		}
 	}
-	gc->scaley = 1.0;
+	gc->topy = 0; gc->bottomy = 1.0;
 	line_to(gc, MIN(sec,maxtime), 0);
 	line_to(gc, begins, 0);
 	cairo_close_path(cr);
@@ -290,6 +297,52 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc)
 	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, struct graphics_context *gc,
 	pressure_t *startp, pressure_t *endp)
@@ -297,7 +350,7 @@ static int get_cylinder_pressure_range(struct dive *dive, struct graphics_contex
 	int i;
 	int min, max;
 
-	gc->scalex = round_seconds_up(dive->duration.seconds);
+	gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
 
 	max = 0;
 	min = 5000000;
@@ -325,7 +378,7 @@ static int get_cylinder_pressure_range(struct dive *dive, struct graphics_contex
 		endp->mbar = min;
 	if (!max)
 		return 0;
-	gc->scaley = max * 1.5;
+	gc->topy = 0; gc->bottomy = max * 1.5;
 	return 1;
 }
 
@@ -387,7 +440,7 @@ 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;
+	const char *unit, *desc;
 	double airuse;
 
 	airuse = calculate_airuse(dive);
@@ -410,6 +463,15 @@ static void plot_info(struct dive *dive, struct graphics_context *gc)
 		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 void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
@@ -445,9 +507,109 @@ static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_conte
 	}
 }
 
+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)
+{
+	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;
@@ -467,14 +629,18 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	plot_cylinder_pressure(dive, gc);
 
 	/* Depth profile */
-	plot_depth_profile(dive, gc);
+	plot_depth_profile(dive, gc, pi);
+
+	/* Temperature profile */
+	plot_temperature_profile(dive, gc);
 
 	/* Text on top of all graphs.. */
-	plot_depth_text(dive, gc);
+	plot_depth_text(dive, gc, pi);
 	plot_cylinder_pressure_text(dive, gc);
 
 	/* And info box in the lower right corner.. */
-	gc->scalex = gc->scaley = 1.0;
+	gc->leftx = 0; gc->rightx = 1.0;
+	gc->topy = 0; gc->bottomy = 1.0;
 	plot_info(dive, gc);
 
 	/* Bounding box last */
@@ -514,7 +680,7 @@ GtkWidget *dive_profile_widget(void)
 	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;