X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=2400321ce640df0b147d9852782bbf40906b7aa8;hb=7c5c9e202408bf4ec86c84826ebc7b2ba0d00c2d;hp=2ddc933d072feef452fd086296a089a8c458c732;hpb=a0096f3a6b2f8723b9f020ac53b22c432c5a61c7;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 2ddc933..2400321 100644
--- a/profile.c
+++ b/profile.c
@@ -14,8 +14,13 @@ int selected_dive = 0;
 struct plot_info {
 	int nr;
 	int maxtime;
+	int maxdepth;
+	int minpressure, maxpressure;
+	int mintemp, maxtemp;
 	struct plot_data {
 		int sec;
+		int pressure, temperature;
+		/* Depth info */
 		int val;
 		int smoothed;
 		struct plot_data *min[3];
@@ -43,10 +48,11 @@ static void line_to(struct graphics_context *gc, double x, double y)
 static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
 {
 	if (gc->printer) {
-		a = 1;
-		if (r+g+b > 1)
+		/* Black is white and white is black */
+		double sum = r+g+b;
+		if (sum > 2)
 			r = g = b = 0;
-		else
+		else if (sum < 1)
 			r = g = b = 1;
 	}
 	cairo_set_source_rgba(gc->cr, r, g, b, a);
@@ -65,8 +71,9 @@ static void set_source_rgb(struct graphics_context *gc, double r, double g, doub
  * 30 minutes or 90 ft, just so that small dives show
  * up as such.
  */
-static int round_seconds_up(int seconds)
+static int get_maxtime(struct plot_info *pi)
 {
+	int seconds = pi->maxtime;
 	return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
@@ -179,7 +186,7 @@ static void plot_depth_text(struct dive *dive, struct graphics_context *gc, stru
 	int maxtime, maxdepth;
 
 	/* Get plot scaling limits */
-	maxtime = round_seconds_up(dive->duration.seconds);
+	maxtime = get_maxtime(pi);
 	maxdepth = round_depth_up(dive->maxdepth);
 
 	gc->leftx = 0; gc->rightx = maxtime;
@@ -240,7 +247,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	int maxtime, maxdepth, marker;
 
 	/* Get plot scaling limits */
-	maxtime = round_seconds_up(dive->duration.seconds);
+	maxtime = get_maxtime(pi);
 	maxdepth = round_depth_up(dive->maxdepth);
 
 	/* Time markers: every 5 min */
@@ -293,33 +300,20 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	line_to(gc, MIN(sec,maxtime), 0);
 	line_to(gc, begins, 0);
 	cairo_close_path(cr);
-	if (!gc->printer) {
-		set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
-		cairo_fill_preserve(cr);
-	}
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
+	cairo_fill_preserve(cr);
 	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
 	cairo_stroke(cr);
 }
 
-static int setup_temperature_limits(struct dive *dive, struct graphics_context *gc)
+static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
 {
-	int i;
 	int maxtime, mintemp, maxtemp;
 
 	/* Get plot scaling limits */
-	maxtime = round_seconds_up(dive->duration.seconds);
-	mintemp = INT_MAX;
-	maxtemp = 0;
-	for (i = 0; i < dive->samples; i++) {
-		struct sample *sample = dive->sample+i;
-		int mkelvin = sample->temperature.mkelvin;
-		if (!mkelvin)
-			continue;
-		if (mkelvin > maxtemp)
-			maxtemp = mkelvin;
-		if (mkelvin < mintemp)
-			mintemp = mkelvin;
-	}
+	maxtime = get_maxtime(pi);
+	mintemp = pi->mintemp;
+	maxtemp = pi->maxtemp;
 
 	gc->leftx = 0; gc->rightx = maxtime;
 	/* Show temperatures in roughly the lower third */
@@ -329,50 +323,67 @@ static int setup_temperature_limits(struct dive *dive, struct graphics_context *
 	return maxtemp > mintemp;
 }
 
-static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
 {
-	int i;
+	int deg;
+	const char *unit;
 	static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
+	temperature_t temperature = { mkelvin };
+
+	if (output_units.temperature == FAHRENHEIT) {
+		deg = to_F(temperature);
+		unit = "F";
+	} else {
+		deg = to_C(temperature);
+		unit = "C";
+	}
+	plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+}
 
+static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
+{
+	int i;
 	int last = 0;
+	int last_temperature = 0, last_printed_temp = 0;
 
-	if (!setup_temperature_limits(dive, gc))
+	if (!setup_temperature_limits(gc, pi))
 		return;
 
-	for (i = 0; i < dive->samples; i++) {
-		const char *unit;
-		struct sample *sample = dive->sample+i;
-		int mkelvin = sample->temperature.mkelvin;
-		int sec, deg;
+	for (i = 0; i < pi->nr; i++) {
+		int sec;
+		struct plot_data *entry = pi->entry+i;
+		int mkelvin = entry->temperature;
+
 		if (!mkelvin)
 			continue;
-		sec = sample->time.seconds;
-		if (sec < last)
+		last_temperature = mkelvin;
+		sec = entry->sec;
+		if (sec < last + 300)
 			continue;
-		last = sec + 300;
-		if (output_units.temperature == FAHRENHEIT) {
-			deg = to_F(sample->temperature);
-			unit = "F";
-		} else {
-			deg = to_C(sample->temperature);
-			unit = "C";
-		}
-		plot_text(gc, &tro, sec, mkelvin, "%d %s", deg, unit);
+		last = sec;
+		plot_single_temp_text(gc,sec,mkelvin);
+		last_printed_temp = mkelvin;
 	}
+	/* it would be nice to print the end temperature, if it's different */
+	if (last_temperature != last_printed_temp)
+		plot_single_temp_text(gc, last, last_temperature);
 }
 
-static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc)
+static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc,
+	struct plot_info *pi)
 {
 	int i;
 	cairo_t *cr = gc->cr;
 	int last = 0;
 
-	if (!setup_temperature_limits(dive, gc))
+	if (!setup_temperature_limits(gc, pi))
 		return;
 
 	set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
 	for (i = 0; i < dive->samples; i++) {
 		struct sample *sample = dive->sample+i;
+		if (sample->time.seconds > dive->duration.seconds)
+			break; /* let's not plot surface temp events */
 		int mkelvin = sample->temperature.mkelvin;
 		if (!mkelvin) {
 			if (!last)
@@ -390,12 +401,14 @@ static void plot_temperature_profile(struct dive *dive, struct graphics_context
 
 /* gets both the actual start and end pressure as well as the scaling factors */
 static int get_cylinder_pressure_range(struct dive *dive, struct graphics_context *gc,
+	struct plot_info *pi,
 	pressure_t *startp, pressure_t *endp)
 {
 	int i;
 	int min, max;
 
-	gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
+	gc->leftx = 0;
+	gc->rightx = get_maxtime(pi);
 
 	max = 0;
 	min = 5000000;
@@ -427,11 +440,12 @@ static int get_cylinder_pressure_range(struct dive *dive, struct graphics_contex
 	return 1;
 }
 
-static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc,
+	struct plot_info *pi)
 {
 	int i, sec = -1;
 
-	if (!get_cylinder_pressure_range(dive, gc, NULL, NULL))
+	if (!get_cylinder_pressure_range(dive, gc, pi, NULL, NULL))
 		return;
 
 	cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
@@ -519,11 +533,12 @@ static void plot_info(struct dive *dive, struct graphics_context *gc)
 	}
 }
 
-static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc,
+	struct plot_info *pi)
 {
 	pressure_t startp, endp;
 
-	if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) {
+	if (get_cylinder_pressure_range(dive, gc, pi, &startp, &endp)) {
 		int start, end;
 		const char *unit = "bar";
 
@@ -599,6 +614,27 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 	int i;
 	int nr = pi->nr;
 
+	/* Do pressure min/max based on the non-surface data */
+	for (i = 0; i < nr; i++) {
+		struct plot_data *entry = pi->entry+i;
+		int pressure = entry->pressure;
+		int temperature = entry->temperature;
+
+		if (pressure) {
+			if (!pi->minpressure || pressure < pi->minpressure)
+				pi->minpressure = pressure;
+			if (pressure > pi->maxpressure)
+				pi->maxpressure = pressure;
+		}
+
+		if (temperature) {
+			if (!pi->mintemp || temperature < pi->mintemp)
+				pi->mintemp = temperature;
+			if (temperature > pi->maxtemp)
+				pi->maxtemp = temperature;
+		}
+	}
+
 	/* Smoothing function: 5-point triangular smooth */
 	for (i = 2; i < nr-2; i++) {
 		struct plot_data *entry = pi->entry+i;
@@ -624,8 +660,9 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
  * sides, so that you can do end-points without having to worry
  * about it.
  */
-static struct plot_info *depth_plot_info(struct dive *dive)
+static struct plot_info *create_plot_info(struct dive *dive)
 {
+	int lastdepth, lastindex;
 	int i, nr = dive->samples + 4, sec;
 	size_t alloc_size = plot_info_size(nr);
 	struct plot_info *pi;
@@ -636,25 +673,42 @@ static struct plot_info *depth_plot_info(struct dive *dive)
 	memset(pi, 0, alloc_size);
 	pi->nr = nr;
 	sec = 0;
+	lastindex = 0;
+	lastdepth = -1;
 	for (i = 0; i < dive->samples; i++) {
+		int depth;
 		struct sample *sample = dive->sample+i;
 		struct plot_data *entry = pi->entry + i + 2;
 
 		sec = entry->sec = sample->time.seconds;
-		entry->val = sample->depth.mm;
+		depth = entry->val = sample->depth.mm;
+		entry->pressure = sample->cylinderpressure.mbar;
+		entry->temperature = sample->temperature.mkelvin;
+
+		if (depth || lastdepth)
+			lastindex = i+2;
+
+		lastdepth = depth;
+		if (depth > pi->maxdepth)
+			pi->maxdepth = depth;
 	}
+	if (lastdepth)
+		lastindex = i + 2;
 	/* Fill in the last two entries with empty values but valid times */
 	i = dive->samples + 2;
 	pi->entry[i].sec = sec + 20;
 	pi->entry[i+1].sec = sec + 40;
 
+	pi->nr = lastindex+1;
+	pi->maxtime = pi->entry[lastindex].sec;
+
 	return analyze_plot_info(pi);
 }
 
 void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 {
 	double topx, topy;
-	struct plot_info *pi = depth_plot_info(dive);
+	struct plot_info *pi = create_plot_info(dive);
 
 	topx = w / 20.0;
 	topy = h / 20.0;
@@ -674,18 +728,18 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	gc->maxy = (h - 2*topy);
 
 	/* Temperature profile */
-	plot_temperature_profile(dive, gc);
+	plot_temperature_profile(dive, gc, pi);
 
 	/* Cylinder pressure plot */
-	plot_cylinder_pressure(dive, gc);
+	plot_cylinder_pressure(dive, gc, pi);
 
 	/* Depth profile */
 	plot_depth_profile(dive, gc, pi);
 
 	/* Text on top of all graphs.. */
-	plot_temperature_text(dive, gc);
+	plot_temperature_text(gc, pi);
 	plot_depth_text(dive, gc, pi);
-	plot_cylinder_pressure_text(dive, gc);
+	plot_cylinder_pressure_text(dive, gc, pi);
 
 	/* And info box in the lower right corner.. */
 	gc->leftx = 0; gc->rightx = 1.0;