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

diff --git a/profile.c b/profile.c
index b4b9230..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;
 
@@ -47,6 +48,14 @@ static void plot_profile(struct dive *dive, cairo_t *cr,
 	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,17 +64,15 @@ static void plot_profile(struct dive *dive, cairo_t *cr,
 		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;
 
 	sample = dive->sample;
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
@@ -87,7 +94,7 @@ static void plot_profile(struct dive *dive, cairo_t *cr,
 	cairo_stroke(cr);
 }
 
-static int get_tank_pressure_range(struct dive *dive, double *scalex, double *scaley)
+static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley)
 {
 	int i;
 	double min, max;
@@ -100,9 +107,12 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc
 		struct sample *sample = dive->sample + i;
 		double bar;
 
-		if (!sample->tankpressure.mbar)
+		/* FIXME! We only track cylinder 0 right now */
+		if (sample->cylinderindex)
+			continue;
+		if (!sample->cylinderpressure.mbar)
 			continue;
-		bar = sample->tankpressure.mbar;
+		bar = sample->cylinderpressure.mbar;
 		if (bar < min)
 			min = bar;
 		if (bar > max)
@@ -114,29 +124,29 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc
 	return 1;
 }
 
-static void plot_tank_pressure(struct dive *dive, cairo_t *cr,
+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_tank_pressure_range(dive, &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));
+	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->tankpressure.mbar;
+		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_line_to(cr, SCALE(dive->duration.seconds, dive->cylinder[0].end.mbar));
 	cairo_stroke(cr);
 }
 
@@ -153,8 +163,8 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
 	/* Depth profile */
 	plot_profile(dive, cr, topx, topy, maxx, maxy);
 
-	/* Tank pressure plot? */
-	plot_tank_pressure(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;
@@ -189,17 +199,13 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer
 	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;
 }