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

diff --git a/profile.c b/profile.c
index c031303..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;
 
@@ -106,6 +107,9 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
 		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;
@@ -131,7 +135,7 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 
 	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;
@@ -142,7 +146,7 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 			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);
 }
 
@@ -195,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;
 }