X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=d38046a4b7ee66a812c293352d63f81c69630c82;hb=19dd61b1268cfef1526cb4195180e19276ea81b4;hp=3fb0735baa8da53a6bfb6327d074dc00ae565dea;hpb=0e3bbd4102ec4d355637b2b8a72a1c16012ec0bc;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 3fb0735..d38046a 100644
--- a/profile.c
+++ b/profile.c
@@ -22,9 +22,11 @@ static int round_seconds_up(int seconds)
 	return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
-static int round_feet_up(int feet)
+static int round_depth_up(depth_t depth)
 {
-	return MAX(90, ROUND_UP(feet+5, 15));
+	unsigned mm = depth.mm;
+	/* Minimum 30m */
+	return MAX(30000, ROUND_UP(mm+3000, 10000));
 }
 
 typedef struct {
@@ -124,7 +126,7 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
-	maxdepth = round_feet_up(to_feet(dive->maxdepth));
+	maxdepth = round_depth_up(dive->maxdepth);
 
 	scalex = maxtime;
 	scaley = maxdepth;
@@ -136,9 +138,22 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 		text_render_options_t tro = {1.0, 0.2, 0.2, CENTER};
 		struct sample *sample = dive->sample+i;
 		int sec = sample->time.seconds;
-		int depth = to_feet(sample->depth);
+		depth_t depth = sample->depth;
+		const char *fmt;
+		double d;
+
+		switch (output_units.length) {
+		case METERS:
+			d = depth.mm / 1000.0;
+			fmt = "%.1f";
+			break;
+		case FEET:
+			d = to_feet(depth);
+			fmt = "%.0f";
+			break;
+		}
 
-		plot_text(cr, &tro, SCALE(sec, depth), "%d ft", depth);
+		plot_text(cr, &tro, SCALE(sec, depth.mm), fmt, d);
 		i = next_minmax(dive, i, 0);
 		if (!i)
 			break;
@@ -152,7 +167,7 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	int begins, sec, depth;
 	int i, samples;
 	struct sample *sample;
-	int maxtime, maxdepth;
+	int maxtime, maxdepth, marker;
 
 	samples = dive->samples;
 	if (!samples)
@@ -162,7 +177,7 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
-	maxdepth = round_feet_up(to_feet(dive->maxdepth));
+	maxdepth = round_depth_up(dive->maxdepth);
 
 	/* Time markers: every 5 min */
 	scalex = maxtime;
@@ -172,11 +187,16 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 		cairo_line_to(cr, SCALE(i, 1));
 	}
 
-	/* Depth markers: every 15 ft */
+	/* Depth markers: every 30 ft or 10 m*/
 	scalex = 1.0;
 	scaley = maxdepth;
+	switch (output_units.length) {
+	case METERS: marker = 10000; break;
+	case FEET: marker = 9144; break;	/* 30 ft */
+	}
+
 	cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
-	for (i = 15; i < maxdepth; i += 15) {
+	for (i = marker; i < maxdepth; i += marker) {
 		cairo_move_to(cr, SCALE(0, i));
 		cairo_line_to(cr, SCALE(1, i));
 	}
@@ -184,8 +204,8 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 
 	/* 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_move_to(cr, SCALE(0, dive->meandepth.mm));
+	cairo_line_to(cr, SCALE(1, dive->meandepth.mm));
 	cairo_stroke(cr);
 
 	scalex = maxtime;
@@ -193,15 +213,17 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	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)));
+	cairo_move_to(cr, SCALE(sample->time.seconds, sample->depth.mm));
 	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 = sample->depth.mm;
+			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 +234,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;
@@ -269,7 +291,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
@@ -309,6 +332,7 @@ static void plot_info(struct dive *dive, cairo_t *cr,
 {
 	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,12 +340,20 @@ 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.8, maxy*0.8, "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.8, maxy*0.85, "SAC: %4.2f", sac);
+		plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f %s/min", sac, unit);
 	}
 }
 
@@ -329,16 +361,37 @@ static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
 	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);
 	}
 }