X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=60b9ab9d9df85dd8cb99db3b33193a5bc9f07ae7;hb=e55b95b415e28e053ad3941f9bd3c41ea461ca58;hp=3f3dd42bc108f1c0b7e048a1521388e92e1a7c2d;hpb=fcc7a01c6e7f7973a1547b8794351311720cef43;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 3f3dd42..60b9ab9 100644
--- a/profile.c
+++ b/profile.c
@@ -22,8 +22,10 @@ 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 {
+		unsigned int same_cylinder:1;
 		int sec;
 		int pressure, temperature;
 		/* Depth info */
@@ -156,24 +158,58 @@ 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, 1.0, 0.1, 0.8);
+	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);
+	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);
+	cairo_line_to(gc->cr, x-9, y+4);
+	cairo_stroke(gc->cr);
+	attach_tooltip(x-15, y-6, 12, 12, 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)
@@ -289,10 +325,12 @@ 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;
 
@@ -452,23 +490,32 @@ 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;
 
 	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++) {
+	for (i = 0; i < pi->nr; i++) {
 		int mbar;
 		struct plot_data *entry = pi->entry + i;
 
 		mbar = entry->pressure;
 		if (!mbar)
 			continue;
-		line_to(gc, entry->sec, mbar);
+		have_pressure = TRUE;
+		if (entry->same_cylinder)
+			line_to(gc, entry->sec, mbar);
+		else
+			move_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);
 }
 
@@ -487,24 +534,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);
 	}
 }
@@ -605,7 +652,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;
 
@@ -618,9 +665,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 (i+past > 0 && 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));
@@ -647,6 +694,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
  */
 static struct plot_info *create_plot_info(struct dive *dive)
 {
+	int cylinderindex = -1;
 	int lastdepth, lastindex;
 	int i, nr = dive->samples + 4, sec;
 	size_t alloc_size = plot_info_size(nr);
@@ -667,7 +715,12 @@ static struct plot_info *create_plot_info(struct dive *dive)
 
 		sec = entry->sec = sample->time.seconds;
 		depth = entry->val = sample->depth.mm;
+
+		entry->same_cylinder = sample->cylinderindex == cylinderindex;
+		cylinderindex = sample->cylinderindex;
 		entry->pressure = sample->cylinderpressure.mbar;
+		if (!entry->same_cylinder && !entry->pressure)
+			entry->pressure = dive->cylinder[cylinderindex].start.mbar;
 		entry->temperature = sample->temperature.mkelvin;
 
 		if (depth || lastdepth)
@@ -683,11 +736,15 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	i = dive->samples + 2;
 	pi->entry[i].sec = sec + 20;
 	pi->entry[i+1].sec = sec + 40;
+	if (cylinderindex >= 0) {
+		pi->entry[i].pressure = dive->cylinder[cylinderindex].end.mbar;
+		pi->entry[i].same_cylinder = 1;
+	}
 
 	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;
@@ -695,14 +752,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);
@@ -714,8 +768,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);
@@ -725,6 +779,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);