X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=032bbd2c5acc86b196799048e46798b741eab99f;hb=11becb87505b8cdf6fbf2f10941f87d394e49f80;hp=9d84ff29d64de926983555be28660abcef2786dc;hpb=968aa28155b3a55b558d16e3a46dfd5c887dc3c6;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 9d84ff2..032bbd2 100644
--- a/profile.c
+++ b/profile.c
@@ -4,6 +4,7 @@
 
 #include "dive.h"
 #include "display.h"
+#include "divelist.h"
 
 int selected_dive = 0;
 
@@ -28,18 +29,18 @@ static int round_feet_up(int feet)
 /* Scale to 0,0 -> maxx,maxy */
 #define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy
 
-static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, struct sample *sample)
+static void plot_profile(struct dive *dive, cairo_t *cr,
+	double topx, double topy, double maxx, double maxy)
 {
-	int i;
-	double topx, topy, maxx, maxy;
 	double scalex, scaley;
-	int maxtime, maxdepth;
 	int begins, sec, depth;
+	int i, samples;
+	struct sample *sample;
+	int maxtime, maxdepth;
 
-	topx = w / 20.0;
-	topy = h / 20.0;
-	maxx = (w - 2*topx);
-	maxy = (h - 2*topy);
+	samples = dive->samples;
+	if (!samples)
+		return;
 
 	cairo_set_line_width(cr, 2);
 
@@ -47,6 +48,14 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, stru
 	maxtime = round_seconds_up(dive->duration.seconds);
 	maxdepth = round_feet_up(to_feet(dive->maxdepth));
 
+	/* Time markers: every 5 min */
+	scalex = maxtime;
+	scaley = 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));
+	}
+
 	/* Depth markers: every 15 ft */
 	scalex = 1.0;
 	scaley = maxdepth;
@@ -55,19 +64,17 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, stru
 		cairo_move_to(cr, SCALE(0, i));
 		cairo_line_to(cr, SCALE(1, i));
 	}
+	cairo_stroke(cr);
 
-	/* Time markers: every 5 min */
-	scalex = maxtime;
-	scaley = 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));
-	}
+	/* Show mean depth */
+	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
+	cairo_move_to(cr, SCALE(0, to_feet(dive->meandepth)));
+	cairo_line_to(cr, SCALE(1, to_feet(dive->meandepth)));
 	cairo_stroke(cr);
 
-	scaley = maxdepth;
+	scalex = maxtime;
 
-	/* Depth profile */
+	sample = dive->sample;
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
 	begins = sample->time.seconds;
 	cairo_move_to(cr, SCALE(sample->time.seconds, to_feet(sample->depth)));
@@ -85,6 +92,79 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, stru
 	cairo_fill_preserve(cr);
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
 	cairo_stroke(cr);
+}
+
+static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley)
+{
+	int i;
+	double min, max;
+
+	*scalex = round_seconds_up(dive->duration.seconds);
+
+	max = 0;
+	min = 5000;
+	for (i = 0; i < dive->samples; i++) {
+		struct sample *sample = dive->sample + i;
+		double bar;
+
+		/* FIXME! We only track cylinder 0 right now */
+		if (sample->cylinderindex)
+			continue;
+		if (!sample->cylinderpressure.mbar)
+			continue;
+		bar = sample->cylinderpressure.mbar;
+		if (bar < min)
+			min = bar;
+		if (bar > max)
+			max = bar;
+	}
+	if (!max)
+		return 0;
+	*scaley = max * 1.5;
+	return 1;
+}
+
+static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
+	double topx, double topy, double maxx, double maxy)
+{
+	int i;
+	double scalex, scaley;
+
+	if (!get_cylinder_pressure_range(dive, &scalex, &scaley))
+		return;
+
+	cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
+
+	cairo_move_to(cr, SCALE(0, dive->cylinder[0].start.mbar));
+	for (i = 1; i < dive->samples; i++) {
+		int sec, mbar;
+		struct sample *sample = dive->sample + i;
+
+		sec = sample->time.seconds;
+		mbar = sample->cylinderpressure.mbar;
+		if (!mbar)
+			continue;
+		cairo_line_to(cr, SCALE(sec, mbar));
+	}
+	cairo_line_to(cr, SCALE(dive->duration.seconds, dive->cylinder[0].end.mbar));
+	cairo_stroke(cr);
+}
+
+static void plot(cairo_t *cr, int w, int h, struct dive *dive)
+{
+	double topx, topy, maxx, maxy;
+	double scalex, scaley;
+
+	topx = w / 20.0;
+	topy = h / 20.0;
+	maxx = (w - 2*topx);
+	maxy = (h - 2*topy);
+
+	/* Depth profile */
+	plot_profile(dive, cr, topx, topy, maxx, maxy);
+
+	/* Cylinder pressure plot? */
+	plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
 
 	/* Bounding box last */
 	scalex = scaley = 1.0;
@@ -111,25 +191,21 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer
 	cairo_set_source_rgb(cr, 0, 0, 0);
 	cairo_paint(cr);
 
-	if (dive && dive->samples)
-		plot(cr, w, h, dive, dive->samples, dive->sample);
+	if (dive)
+		plot(cr, w, h, dive);
 
 	cairo_destroy(cr);
 
 	return FALSE;
 }
 
-GtkWidget *dive_profile_frame(void)
+GtkWidget *dive_profile_widget(void)
 {
-	GtkWidget *frame;
 	GtkWidget *da;
 
-	frame = gtk_frame_new("Dive profile");
-	gtk_widget_show(frame);
 	da = gtk_drawing_area_new();
 	gtk_widget_set_size_request(da, 450, 350);
 	g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
-	gtk_container_add(GTK_CONTAINER(frame), da);
 
-	return frame;
+	return da;
 }