X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=f40742c4a354c22e905c75ea21d096bdc4289092;hb=53f809ccca43354f443bb8e02621a5625eb38fde;hp=9a9d98642934bc308e12b0f0a9be7b5cb6497d0e;hpb=e1171a57a76c1f3277c54bcc48a9fe6c29b741ec;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 9a9d986..f40742c 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>
@@ -18,6 +22,7 @@ struct plot_info {
 	int maxtime;
 	int meandepth, maxdepth;
 	int minpressure, maxpressure;
+	int endpressure; /* start pressure better be max pressure */
 	int mintemp, maxtemp;
 	struct plot_data {
 		int sec;
@@ -61,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);
 }
@@ -149,24 +157,52 @@ 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;
+	int x,y;
+
+	for (i = 0; i < pi->nr; i++) {
+		struct plot_data *data = pi->entry + i;
+		if (event->time.seconds < data->sec)
+			break;
+		depth = data->val;
+	}
+	/* draw a little tirangular marker and attach tooltip */
+	x = SCALEX(gc, event->time.seconds);
+	y = SCALEY(gc, depth);
+	set_source_rgba(gc, 1.0, 0.1, 0.1, 0.5);
+	cairo_move_to(gc->cr, x-6, y-3);
+	cairo_line_to(gc->cr, x  , y-3);
+	cairo_line_to(gc->cr, x-3, y+3);
+	cairo_line_to(gc->cr, x-6, y-3);
+	cairo_stroke_preserve(gc->cr);
+	cairo_fill(gc->cr);
+	attach_tooltip(x-6, y-3, 6, 6, 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)
@@ -208,7 +244,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++;
@@ -223,7 +259,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++;
@@ -250,9 +286,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 {
 	int i;
 	cairo_t *cr = gc->cr;
-	int ends, sec, depth;
-	int *secs;
-	int *depths;
+	int sec, depth;
 	struct plot_data *entry;
 	int maxtime, maxdepth, marker;
 
@@ -284,59 +318,59 @@ 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);
-
-	entry = pi->entry;
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	secs = (int *) malloc(sizeof(int) * pi->nr);
-	depths = (int *) malloc(sizeof(int) * pi->nr);
-	secs[0] = entry->sec;
-	depths[0] = entry->val;
-	for (i = 1; i < pi->nr; i++) {
-		entry++;
-		sec = entry->sec;
-		if (sec <= maxtime || entry->val > 0) {
-			/* 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, secs[i-1], depths[i-1]);
-			line_to(gc, sec, depth);
-			cairo_stroke(cr);
-			ends = i;
-		}
-		secs[i] = sec;
-		depths[i] = depth;
+	/*
+	 * 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);
 	}
-	move_to(gc, secs[ends], depths[ends]);
-	gc->topy = 0; gc->bottomy = 1.0;
-	line_to(gc, secs[ends], 0);
-	line_to(gc, secs[0], 0);
-	cairo_close_path(cr);
+
 	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	cairo_stroke(cr);
-	/* now do it again for the neat fill */
+
+	/* 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);
-	move_to(gc, secs[0], depths[0]);
-	for (i = 1; i <= ends; i++) {
-		line_to(gc, secs[i],depths[i]);
-	}
-	gc->topy = 0; gc->bottomy = 1.0;
-	line_to(gc, secs[ends], 0);
-	line_to(gc, secs[0], 0);
+
+	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;
+		/* 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);
+	}
 }
 
 static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
@@ -372,12 +406,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)
@@ -449,11 +483,12 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
 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++) {
@@ -463,9 +498,15 @@ 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);
 }
 
@@ -484,24 +525,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);
 	}
 }
@@ -602,7 +643,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 	}
 
 	/* Smoothing function: 5-point triangular smooth */
-	for (i = 2; i < nr-1; i++) {
+	for (i = 2; i < nr; i++) {
 		struct plot_data *entry = pi->entry+i;
 		int val;
 
@@ -615,9 +656,9 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 		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 < 30 && entry->velocity < FAST) { 
+			if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) {
 				int past = -2;
-				while (pi->entry <= entry-past && entry[0].sec - entry[past].sec < 30)
+				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));
@@ -684,7 +725,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;
@@ -692,14 +733,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);
@@ -711,8 +749,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);
@@ -722,6 +760,7 @@ 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);
@@ -740,36 +779,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);
 }