X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=705d90cd652e15a59c47fba9c34e07e30d6a46dc;hb=7bbdea19ed0c634b4a990e49be7a2c8936a61818;hp=af1976e612e6028685c02be621d98cf59dd96516;hpb=dbfce3035ef1499e47607a84b3ed07ccc95abd70;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index af1976e..705d90c 100644
--- a/profile.c
+++ b/profile.c
@@ -28,8 +28,8 @@ static int round_feet_up(int feet)
 }
 
 typedef struct {
-    double r,g,b;
-    enum {CENTER,LEFT} allign;
+	double r,g,b;
+	enum {CENTER,LEFT} allign;
 } text_render_options_t;
 
 static void plot_text(cairo_t *cr, text_render_options_t *tro,
@@ -46,7 +46,7 @@ static void plot_text(cairo_t *cr, text_render_options_t *tro,
 	cairo_text_extents(cr, buffer, &extents);
 
 	if (tro->allign == CENTER)
-	    x -= extents.width/2 + extents.x_bearing;
+		x -= extents.width/2 + extents.x_bearing;
 	y += extents.height * 1.2;
 
 	cairo_move_to(cr, x, y);
@@ -113,10 +113,10 @@ static int next_minmax(struct dive *dive, int index, int minmax)
 }
 
 /* Scale to 0,0 -> maxx,maxy */
-#define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy
+#define SCALE(x,y) (x)*maxx/scalex,(y)*maxy/scaley
 
 static void plot_depth_text(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	double scalex, scaley;
 	int maxtime, maxdepth;
@@ -146,7 +146,7 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 }
 
 static void plot_depth_profile(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	double scalex, scaley;
 	int begins, sec, depth;
@@ -197,11 +197,13 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	for (i = 1; i < dive->samples; i++) {
 		sample++;
 		sec = sample->time.seconds;
-		depth = to_feet(sample->depth);
-		cairo_line_to(cr, SCALE(sec, depth));
+		if (sec <= maxtime) {
+			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(MIN(sec,maxtime), 0));
 	cairo_line_to(cr, SCALE(begins, 0));
 	cairo_close_path(cr);
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
@@ -212,37 +214,37 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 
 /* gets both the actual start and end pressure as well as the scaling factors */
 static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley,
-				       double *startp, double *endp)
+				       pressure_t *startp, pressure_t *endp)
 {
 	int i;
-	double min, max;
-	double bar;
+	int min, max;
 
 	*scalex = round_seconds_up(dive->duration.seconds);
 
 	max = 0;
-	min = 5000;
+	min = 5000000;
 	if (startp)
-	    *startp = *endp = 0.0;
+		startp->mbar = endp->mbar = 0;
 
 	for (i = 0; i < dive->samples; i++) {
+		int mbar;
 		struct sample *sample = dive->sample + i;
 
 		/* FIXME! We only track cylinder 0 right now */
 		if (sample->cylinderindex)
 			continue;
-		if (!sample->cylinderpressure.mbar)
+		mbar = sample->cylinderpressure.mbar;
+		if (!mbar)
 			continue;
-		bar = sample->cylinderpressure.mbar;
-		if (bar != 0.0 && startp && *startp == 0.0)
-		    *startp = bar;
-		if (bar < min)
-			min = bar;
-		if (bar > max)
-			max = bar;
+		if (mbar < min)
+			min = mbar;
+		if (mbar > max)
+			max = mbar;
 	}
+	if (startp)
+		startp->mbar = max;
 	if (endp)
-	    *endp = bar;
+		endp->mbar = min;
 	if (!max)
 		return 0;
 	*scaley = max * 1.5;
@@ -250,7 +252,7 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
 }
 
 static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	int i, sec = -1;
 	double scalex, scaley;
@@ -269,7 +271,8 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 		if (!mbar)
 			continue;
 		sec = sample->time.seconds;
-		cairo_line_to(cr, SCALE(sec, mbar));
+		if (sec <= dive->duration.seconds)
+			cairo_line_to(cr, SCALE(sec, mbar));
 	}
 	/*
 	 * We may have "surface time" events, in which case we don't go
@@ -305,10 +308,11 @@ static double calculate_airuse(struct dive *dive)
 }
 
 static void plot_info(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
 	const double liters_per_cuft = 28.317;
+	const char *unit;
 	double airuse;
 
 	airuse = calculate_airuse(dive);
@@ -316,29 +320,58 @@ static void plot_info(struct dive *dive, cairo_t *cr,
 		return;
 
 	/* I really need to start addign some unit setting thing */
-	airuse /= liters_per_cuft;
-	plot_text(cr, &tro, maxx*0.95, maxy*0.9, "cuft: %4.2f", airuse);
+	switch (output_units.volume) {
+	case LITER:
+		unit = "l";
+		break;
+	case CUFT:
+		unit = "cuft";
+		airuse /= liters_per_cuft;
+		break;
+	}
+	plot_text(cr, &tro, maxx*0.8, maxy*0.8, "vol: %4.2f %s", airuse, unit);
 	if (dive->duration.seconds) {
 		double pressure = 1 + (dive->meandepth.mm / 10000.0);
 		double sac = airuse / pressure * 60 / dive->duration.seconds;
-		plot_text(cr, &tro, maxx*0.95, maxy*0.95, "SAC: %4.2f", sac);
+		plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f %s/min", sac, unit);
 	}
 }
 
 static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	double scalex, scaley;
-	double startp,endp;
+	pressure_t startp, endp;
 
 	cairo_set_font_size(cr, 10);
 
 	if (get_cylinder_pressure_range(dive, &scalex, &scaley,
 					&startp, &endp)) {
+		int start, end;
+		const char *unit = "bar";
+
+		switch (output_units.pressure) {
+		case PASCAL:
+			start = startp.mbar * 100;
+			end = startp.mbar * 100;
+			unit = "pascal";
+			break;
+		case BAR:
+			start = (startp.mbar + 500) / 1000;
+			end = (endp.mbar + 500) / 1000;
+			unit = "bar";
+			break;
+		case PSI:
+			start = to_PSI(startp);
+			end = to_PSI(endp);
+			unit = "psi";
+			break;
+		}
+
 		text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
-		plot_text(cr, &tro, SCALE(0, startp), "%3.0f bar", startp/1000.0);
-		plot_text(cr, &tro, SCALE(dive->duration.seconds, endp),
-			  "%3.0f bar", endp/1000.0);
+		plot_text(cr, &tro, SCALE(0, startp.mbar), "%d %s", start, unit);
+		plot_text(cr, &tro, SCALE(dive->duration.seconds, endp.mbar),
+			  "%d %s", end, unit);
 	}
 }
 
@@ -351,19 +384,20 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
 	topy = h / 20.0;
 	maxx = (w - 2*topx);
 	maxy = (h - 2*topy);
+	cairo_translate(cr, topx, topy);
 
 	/* Cylinder pressure plot */
-	plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
+	plot_cylinder_pressure(dive, cr, maxx, maxy);
 
 	/* Depth profile */
-	plot_depth_profile(dive, cr, topx, topy, maxx, maxy);
+	plot_depth_profile(dive, cr, maxx, maxy);
 
 	/* Text on top of all graphs.. */
-	plot_depth_text(dive, cr, topx, topy, maxx, maxy);
-	plot_cylinder_pressure_text(dive, cr, topx, topy, maxx, maxy);
+	plot_depth_text(dive, cr, maxx, maxy);
+	plot_cylinder_pressure_text(dive, cr, maxx, maxy);
 
 	/* And info box in the lower right corner.. */
-	plot_info(dive, cr, topx, topy, maxx, maxy);
+	plot_info(dive, cr, maxx, maxy);
 
 	/* Bounding box last */
 	scalex = scaley = 1.0;