X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=47e12ba66352421b6cc36790ba1b293f43edf52f;hb=855df669d9aa3a30a8a5db708a63ee9991968bab;hp=9f8fa75b37e8739a8d0144af6e093c716006df00;hpb=4e876b3082b46913d71e0f9bb6ff084aca4a2184;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 9f8fa75..47e12ba 100644
--- a/profile.c
+++ b/profile.c
@@ -620,14 +620,13 @@ static const rgb_t sac_color[SAC_COLORS] = {
 static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
 {
 	int sac_index = 0;
-	int delta = sac - avg_sac + 6000;
+	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]);
 }
 
@@ -670,20 +669,17 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 		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);
+			sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
+		} else {
+			int j;
+			sac = 0;
+			for (j = last; j < i; j++)
+				sac += GET_LOCAL_SAC(pi->entry + j, pi->entry + j + 1, dive);
+			sac /= (i - last);
+			if (entry->sec - last_entry->sec >= SAC_WINDOW) {
+				last++;
+				last_entry = pi->entry + last;
 			}
-		} 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) {
@@ -718,7 +714,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
 	plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
 
-static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
+static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
 {
 	int i;
 	int mbar, cyl;
@@ -764,7 +760,10 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 
 	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
 		if (last_time[cyl]) {
-			plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
+			if (dive->cylinder[cyl].end.mbar)
+				plot_pressure_value(gc, dive->cylinder[cyl].end.mbar, last_time[cyl], CENTER, TOP);
+			else
+				plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
 		}
 	}
 }
@@ -999,10 +998,11 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
 					list = NULL;
 					continue;
 				}
-				magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;				}
+				magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;
+			}
 			if (pt != 0.0) {
 				double cur_pt = (entry->sec - (entry-1)->sec) *
-					(1 + entry->depth / 10000.0);
+					(1 + (entry->depth + (entry-1)->depth) / 20000.0);
 				INTERPOLATED_PRESSURE(entry) =
 					cur_pr[entry->cylinderindex] + cur_pt * magic;
 				cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
@@ -1141,8 +1141,13 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
 		while (ev && ev->time.seconds < sample->time.seconds) {
 			/* insert two fake plot info structures for the end of
 			 * the old tank and the start of the new tank */
-			entry->sec = ev->time.seconds;
-			(entry+1)->sec = ev->time.seconds + 1;
+			if (ev->time.seconds == sample->time.seconds - 1) {
+				entry->sec = ev->time.seconds - 1;
+				(entry+1)->sec = ev->time.seconds;
+			} else {
+				entry->sec = ev->time.seconds;
+				(entry+1)->sec = ev->time.seconds + 1;
+			}
 			/* we need a fake depth - let's interpolate */
 			if (i) {
 				entry->depth = sample->depth.mm -
@@ -1218,7 +1223,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
 		}
 		/* finally, do the discrete integration to get the SAC rate equivalent */
 		current->pressure_time += (entry->sec - (entry-1)->sec) *
-						(1 + entry->depth / 10000.0);
+			(1 + (entry->depth + (entry-1)->depth) / 20000.0);
 		missing_pr |= !SENSOR_PRESSURE(entry);
 	}
 
@@ -1312,17 +1317,17 @@ 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);
-	plot_cylinder_pressure_text(gc, pi);
+	plot_cylinder_pressure_text(gc, pi, dive);
 
 	/* Bounding box last */
 	gc->leftx = 0; gc->rightx = 1.0;