X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=070e6fa7054445e26031335c4c1b5e1ac35ccbff;hb=f8de487c2f590d6f4e27f878ac104c229667702c;hp=3649bc1319aae494d42632e688a2d61cda03ff54;hpb=eed9538101a97142d8327119b9539f847f818198;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 3649bc1..070e6fa 100644
--- a/profile.c
+++ b/profile.c
@@ -8,32 +8,38 @@
 int selected_dive = 0;
 
 #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
 
+/*
+ * When showing dive profiles, we scale things to the
+ * current dive. However, we don't scale past less than
+ * 30 minutes or 90 ft, just so that small dives show
+ * up as such.
+ */
 static int round_seconds_up(int seconds)
 {
-	return MAX(30, ROUND_UP(seconds, 60*10));
+	return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
 static int round_feet_up(int feet)
 {
-	return MAX(45, ROUND_UP(feet+5, 15));
+	return MAX(90, ROUND_UP(feet+5, 15));
 }
 
 /* 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 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);
 
@@ -41,6 +47,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;
@@ -49,26 +63,104 @@ 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)));
 	for (i = 1; i < dive->samples; i++) {
 		sample++;
-		cairo_line_to(cr, SCALE(sample->time.seconds, to_feet(sample->depth)));
+		sec = sample->time.seconds;
+		depth = to_feet(sample->depth);
+		cairo_line_to(cr, SCALE(sec, depth));
 	}
+	scaley = 1.0;
+	cairo_line_to(cr, SCALE(sec, 0));
+	cairo_line_to(cr, SCALE(begins, 0));
+	cairo_close_path(cr);
+	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
+	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;
+
+		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->beginning_pressure.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->end_pressure.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;
@@ -84,7 +176,7 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, stru
 
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	struct dive *dive = dive_table.dives[selected_dive];
+	struct dive *dive = current_dive;
 	cairo_t *cr;
 	int w,h;
 
@@ -95,25 +187,21 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer
 	cairo_set_source_rgb(cr, 0, 0, 0);
 	cairo_paint(cr);
 
-	if (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;
 }