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

diff --git a/profile.c b/profile.c
index 3b69f18..df1b22b 100644
--- a/profile.c
+++ b/profile.c
@@ -670,19 +670,19 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 			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);
+				/* don't start with a sac of 0, so just calculate the first one */
+				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) {
@@ -717,7 +717,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;
@@ -763,7 +763,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);
 		}
 	}
 }
@@ -998,10 +1001,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);
@@ -1217,7 +1221,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);
 	}
 
@@ -1321,7 +1325,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	/* 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;