X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=3b69f18398d2888b41be42a76bd1c603eebc1600;hb=e1019cafa87058562d9f5844619841546029a57c;hp=88e86941b40a0082788f74a1562b6b3449f7503f;hpb=4cff1f5b90217365d13ab2e2d5ff09b35590aab3;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 88e8694..3b69f18 100644
--- a/profile.c
+++ b/profile.c
@@ -48,7 +48,7 @@ struct plot_info {
 
 /* convert velocity to colors */
 typedef struct { double r, g, b; } rgb_t;
-static const rgb_t rgb[] = {
+static const rgb_t velocity_color[] = {
 	[STABLE]   = {0.0, 0.4, 0.0},
 	[SLOW]     = {0.4, 0.8, 0.0},
 	[MODERATE] = {0.8, 0.8, 0.0},
@@ -89,6 +89,11 @@ static void set_source_rgba(struct graphics_context *gc, double r, double g, dou
 	cairo_set_source_rgba(gc->cr, r, g, b, a);
 }
 
+static void set_source_rgb_struct(struct graphics_context *gc, const rgb_t *rgb)
+{
+	set_source_rgba(gc, rgb->r, rgb->g, rgb->b, 1);
+}
+
 void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
 {
 	set_source_rgba(gc, r, g, b, 1);
@@ -476,9 +481,8 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 		/* we want to draw the segments in different colors
 		 * representing the vertical velocity, so we need to
 		 * chop this into short segments */
-		rgb_t color = rgb[entry->velocity];
 		depth = entry->depth;
-		set_source_rgb(gc, color.r, color.g, color.b);
+		set_source_rgb_struct(gc, &velocity_color[entry->velocity]);
 		move_to(gc, entry[-1].sec, entry[-1].depth);
 		line_to(gc, sec, depth);
 		cairo_stroke(cr);
@@ -595,36 +599,44 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
 	return pi->maxpressure != 0;
 }
 
-/* set the color for the pressure plot according to temporary sac rate */
-static void set_sac_color(struct graphics_context *gc, double sac)
+#define SAC_COLORS 9
+static const rgb_t sac_color[SAC_COLORS] = {
+	{ 0.0, 0.4, 0.2},
+	{ 0.2, 0.6, 0.2},
+	{ 0.4, 0.8, 0.2},
+	{ 0.6, 0.8, 0.2},
+	{ 0.8, 0.8, 0.2},
+	{ 0.8, 0.6, 0.2},
+	{ 0.8, 0.4, 0.2},
+	{ 0.9, 0.3, 0.2},
+	{ 1.0, 0.2, 0.2},
+};
+
+/* set the color for the pressure plot according to temporary sac rate
+ * as compared to avg_sac; the calculation simply maps the delta between
+ * sac and avg_sac to indexes 0 .. (SAC_COLORS - 1) with everything
+ * more than 6000 ml/min below avg_sac mapped to 0 */
+
+static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
 {
-	if (sac < 9)
-		set_source_rgba(gc, 0.0, 0.4, 0.2, 0.80);
-	else if (sac < 11)
-		set_source_rgba(gc, 0.2, 0.6, 0.2, 0.80);
-	else if (sac < 13)
-		set_source_rgba(gc, 0.4, 0.8, 0.2, 0.80);
-	else if (sac < 15)
-		set_source_rgba(gc, 0.6, 0.8, 0.2, 0.80);
-	else if (sac < 17)
-		set_source_rgba(gc, 0.8, 0.8, 0.2, 0.80);
-	else if (sac < 19)
-		set_source_rgba(gc, 0.8, 0.6, 0.2, 0.80);
-	else if (sac < 21)
-		set_source_rgba(gc, 0.8, 0.4, 0.2, 0.80);
-	else if (sac < 23)
-		set_source_rgba(gc, 0.9, 0.3, 0.2, 0.80);
-	else
-		set_source_rgba(gc, 1.0, 0.2, 0.2, 0.80);
+	int sac_index = 0;
+	int delta = sac - avg_sac + 7000;
+
+	sac_index = delta / 2000;
+	if (sac_index < 0)
+		sac_index = 0;
+	if (sac_index > SAC_COLORS - 1)
+		sac_index = SAC_COLORS - 1;
+	set_source_rgb_struct(gc, &sac_color[sac_index]);
 }
 
-/* calculate the current SAC in l/min */
-#define GET_LOCAL_SAC(_entry1, _entry2, _dive)					\
+/* 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) /		\
-		1000000.0)
+		1000.0)
 
 #define SAC_WINDOW 45	/* sliding window in seconds for current SAC calculation */
 
@@ -635,7 +647,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 	int last = -1;
 	int lift_pen = FALSE;
 	int first_plot = TRUE;
-	double sac = 0.0;
+	int sac = 0;
 	struct plot_data *last_entry = NULL;
 
 	if (!get_cylinder_pressure_range(gc, pi))
@@ -672,7 +684,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 			last++;
 			last_entry = pi->entry + last;
 		}
-		set_sac_color(gc, sac);
+		set_sac_color(gc, sac, dive->sac);
 		if (lift_pen) {
 			if (!first_plot && entry->same_cylinder) {
 				/* if we have a previous event from the same tank,
@@ -1299,13 +1311,13 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	/* Temperature profile */
 	plot_temperature_profile(gc, pi);
 
-	/* Cylinder pressure plot */
-	plot_cylinder_pressure(gc, pi, dive);
-
 	/* Depth profile */
 	plot_depth_profile(gc, pi);
 	plot_events(gc, pi, dive);
 
+	/* Cylinder pressure plot */
+	plot_cylinder_pressure(gc, pi, dive);
+
 	/* Text on top of all graphs.. */
 	plot_temperature_text(gc, pi);
 	plot_depth_text(gc, pi);