X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=1b1546c0f7f83614b3b16aa3ce7c07895b082b94;hb=47a0e0e4be9b6074ca81e9e22191a0916d6f7c26;hp=32a47f9af11c60dec6006381e78c5c8fab621a03;hpb=34d79509617685c0df39abf0775f7065ec52e8e8;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 32a47f9..1b1546c 100644
--- a/profile.c
+++ b/profile.c
@@ -21,8 +21,7 @@ struct plot_info {
 	int nr;
 	int maxtime;
 	int meandepth, maxdepth;
-	int minpressure, maxpressure;
-	int endpressure; /* start pressure better be max pressure */
+	int maxpressure;
 	int mintemp, maxtemp;
 	struct plot_data {
 		unsigned int same_cylinder:1;
@@ -45,6 +44,7 @@ struct plot_info {
 #define INTERPOLATED_PR 1
 #define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]
 #define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR]
+#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
 
 /* convert velocity to colors */
 typedef struct { double r, g, b; } rgb_t;
@@ -102,9 +102,9 @@ static void dump_pi (struct plot_info *pi)
 	int i;
 
 	printf("pi:{nr:%d maxtime:%d meandepth:%d maxdepth:%d \n"
-		"    minpressure:%d maxpressure:%d endpressure:%d mintemp:%d maxtemp:%d\n",
+		"    maxpressure:%d mintemp:%d maxtemp:%d\n",
 		pi->nr, pi->maxtime, pi->meandepth, pi->maxdepth,
-		pi->minpressure, pi->maxpressure, pi->endpressure, pi->mintemp, pi->maxtemp);
+		pi->maxpressure, pi->mintemp, pi->maxtemp);
 	for (i = 0; i < pi->nr; i++)
 		printf("    entry[%d]:{same_cylinder:%d cylinderindex:%d sec:%d pressure:{%d,%d}\n"
 			"                temperature:%d depth:%d smoothed:%d}\n",
@@ -595,55 +595,105 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
 	return pi->maxpressure != 0;
 }
 
-static void plot_pressure_helper(struct graphics_context *gc, struct plot_info *pi, int type)
+/* set the color for the pressure plot according to temporary sac rate
+ * as compared to avg_sac */
+static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
+{
+	int delta = sac - avg_sac;
+	if (delta < -6000)
+		set_source_rgb(gc, 0.0, 0.4, 0.2);
+	else if (delta < -4000)
+		set_source_rgb(gc, 0.2, 0.6, 0.2);
+	else if (delta < -2000)
+		set_source_rgb(gc, 0.4, 0.8, 0.2);
+	else if (delta < 0)
+		set_source_rgb(gc, 0.6, 0.8, 0.2);
+	else if (delta < 2000)
+		set_source_rgb(gc, 0.8, 0.8, 0.2);
+	else if (delta < 4000)
+		set_source_rgb(gc, 0.8, 0.6, 0.2);
+	else if (delta < 6000)
+		set_source_rgb(gc, 0.8, 0.4, 0.2);
+	else if (delta < 8000)
+		set_source_rgb(gc, 0.9, 0.3, 0.2);
+	else
+		set_source_rgb(gc, 1.0, 0.2, 0.2);
+}
+
+/* calculate the current SAC in ml/min and convert to int */
+#define GET_LOCAL_SAC(_entry1, _entry2, _dive)	(int)				\
+	((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) *			\
+		(_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter /	\
+		(((_entry2)->sec - (_entry1)->sec) / 60.0) /			\
+		(1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) /		\
+		1000.0)
+
+#define SAC_WINDOW 45	/* sliding window in seconds for current SAC calculation */
+
+static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi,
+				struct dive *dive)
 {
 	int i;
+	int last = -1;
 	int lift_pen = FALSE;
+	int first_plot = TRUE;
+	int sac = 0;
+	struct plot_data *last_entry = NULL;
+
+	if (!get_cylinder_pressure_range(gc, pi))
+		return;
 
 	for (i = 0; i < pi->nr; i++) {
 		int mbar;
 		struct plot_data *entry = pi->entry + i;
 
-		mbar = entry->pressure[type];
-		if (!entry->same_cylinder)
+		mbar = GET_PRESSURE(entry);
+		if (!entry->same_cylinder) {
 			lift_pen = TRUE;
+			last_entry = NULL;
+		}
 		if (!mbar) {
 			lift_pen = TRUE;
 			continue;
 		}
+		if (!last_entry) {
+			last = i;
+			last_entry = entry;
+			if (first_plot) {
+				/* don't start with a sac of 0 */
+				int fe = i + 1;
+				struct plot_data *future_entry = pi->entry + fe;
+				while (fe < pi->nr && future_entry->sec - entry->sec < SAC_WINDOW) {
+					fe++;
+					future_entry = pi->entry + fe;
+				}
+				sac = GET_LOCAL_SAC(entry, future_entry, dive);
+			}
+		} else if (entry->sec - last_entry->sec >= SAC_WINDOW) {
+			sac = GET_LOCAL_SAC(last_entry, entry, dive);
+			last++;
+			last_entry = pi->entry + last;
+		}
+		set_sac_color(gc, sac, dive->sac);
 		if (lift_pen) {
-			if (i > 0 && entry->same_cylinder) {
+			if (!first_plot && entry->same_cylinder) {
 				/* if we have a previous event from the same tank,
-				 * draw at least a short line .
-				 * This uses the implementation detail that the
-				 * type is either 0 or 1 */
+				 * draw at least a short line */
 				int prev_pr;
-				prev_pr = (entry-1)->pressure[type] ? : (entry-1)->pressure[1 - type];
+				prev_pr = GET_PRESSURE(entry - 1);
 				move_to(gc, (entry-1)->sec, prev_pr);
 				line_to(gc, entry->sec, mbar);
-			} else
+			} else {
+				first_plot = FALSE;
 				move_to(gc, entry->sec, mbar);
+			}
 			lift_pen = FALSE;
-		}
-		else
+		} else {
 			line_to(gc, entry->sec, mbar);
+		}
+		cairo_stroke(gc->cr);
+		move_to(gc, entry->sec, mbar);
 	}
-	cairo_stroke(gc->cr);
-
-}
-
-static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
-{
-	if (!get_cylinder_pressure_range(gc, pi))
-		return;
-
-	/* first plot the pressure readings we have from the dive computer */
-	set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
-	plot_pressure_helper(gc, pi, SENSOR_PR);
-
-	/* then, in a different color, the interpolated values */
-	set_source_rgba(gc, 1.0, 1.0, 0.2, 0.80);
-	plot_pressure_helper(gc, pi, INTERPOLATED_PR);
 }
 
 static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
@@ -657,8 +707,6 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
 	plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
 
-#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
-
 static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
 {
 	int i;
@@ -699,7 +747,8 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 		}
 	}
 	cyl = entry->cylinderindex;
-	last_pressure[cyl] = GET_PRESSURE(entry);
+	if (GET_PRESSURE(entry))
+		last_pressure[cyl] = GET_PRESSURE(entry);
 	last_time[cyl] = entry->sec;
 
 	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
@@ -790,8 +839,6 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 		int temperature = entry->temperature;
 
 		if (pressure) {
-			if (!pi->minpressure || pressure < pi->minpressure)
-				pi->minpressure = pressure;
 			if (pressure > pi->maxpressure)
 				pi->maxpressure = pressure;
 		}
@@ -937,6 +984,7 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
 				if (!nlist) {
 					/* just continue without calculating
 					 * interpolated values */
+					INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
 					list = NULL;
 					continue;
 				}
@@ -1192,8 +1240,15 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
 		pi->nr++;
 	pi->maxtime = pi->entry[lastindex].sec;
 
-	pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
-	pi->maxpressure = dive->cylinder[0].start.mbar;
+	/* Analyze_plot_info() will do the sample max pressures,
+	 * this handles the manual pressures
+	 */
+	pi->maxpressure = 0;
+	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
+		unsigned int mbar = dive->cylinder[cyl].start.mbar;
+		if (mbar > pi->maxpressure)
+			pi->maxpressure = mbar;
+	}
 
 	pi->meandepth = dive->meandepth.mm;
 
@@ -1247,7 +1302,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	plot_temperature_profile(gc, pi);
 
 	/* Cylinder pressure plot */
-	plot_cylinder_pressure(gc, pi);
+	plot_cylinder_pressure(gc, pi, dive);
 
 	/* Depth profile */
 	plot_depth_profile(gc, pi);