X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=ca383a53dc865e024a27334ecdeff89a38603f6f;hb=fe0eff8f1ef6f5bd73a0b89d3ac5fc334650c184;hp=0e5361704fc88cca0214919732b63894b4bb7fa5;hpb=bd0f2747717d55a8c6d21cb37cb746d71cb42fea;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 0e53617..ca383a5 100644
--- a/profile.c
+++ b/profile.c
@@ -22,6 +22,7 @@ struct plot_info {
 	int maxtime;
 	int meandepth, maxdepth;
 	int minpressure, maxpressure;
+	int endpressure; /* start pressure better be max pressure */
 	int mintemp, maxtemp;
 	struct plot_data {
 		int sec;
@@ -306,10 +307,12 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 	cairo_stroke(cr);
 
 	/* Show mean depth */
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
-	move_to(gc, 0, pi->meandepth);
-	line_to(gc, 1, pi->meandepth);
-	cairo_stroke(cr);
+	if (! gc->printer) {
+		set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
+		move_to(gc, 0, pi->meandepth);
+		line_to(gc, 1, pi->meandepth);
+		cairo_stroke(cr);
+	}
 
 	gc->leftx = 0; gc->rightx = maxtime;
 
@@ -469,6 +472,7 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
 static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
 {
 	int i;
+	int have_pressure = FALSE;
 
 	if (!get_cylinder_pressure_range(gc, pi))
 		return;
@@ -483,9 +487,15 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 		mbar = entry->pressure;
 		if (!mbar)
 			continue;
+		have_pressure = TRUE;
 		line_to(gc, entry->sec, mbar);
 	}
-	line_to(gc, pi->maxtime, pi->minpressure);
+	/* if we have valid samples, we don't want to draw a line to the minpressure
+	 * but just end wherever the dive ended (think valve shutdowns during dive)
+	 * but that doesn't work so well if we have only max and min
+	 */
+	if (! have_pressure)
+		line_to(gc, pi->maxtime, pi->minpressure);
 	cairo_stroke(gc->cr);
 }
 
@@ -504,24 +514,24 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 		switch (output_units.pressure) {
 		case PASCAL:
 			start = pi->maxpressure * 100;
-			end = pi->minpressure * 100;
+			end = pi->endpressure * 100;
 			unit = "pascal";
 			break;
 		case BAR:
 			start = (pi->maxpressure + 500) / 1000;
-			end = (pi->minpressure + 500) / 1000;
+			end = (pi->endpressure + 500) / 1000;
 			unit = "bar";
 			break;
 		case PSI:
 			start = mbar_to_PSI(pi->maxpressure);
-			end = mbar_to_PSI(pi->minpressure);
+			end = mbar_to_PSI(pi->endpressure);
 			unit = "psi";
 			break;
 		}
 
 		text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
 		plot_text(gc, &tro, 0, pi->maxpressure, "%d %s", start, unit);
-		plot_text(gc, &tro, pi->maxtime, pi->minpressure,
+		plot_text(gc, &tro, pi->maxtime, pi->endpressure,
 			  "%d %s", end, unit);
 	}
 }
@@ -622,7 +632,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 	}
 
 	/* Smoothing function: 5-point triangular smooth */
-	for (i = 2; i < nr-1; i++) {
+	for (i = 2; i < nr; i++) {
 		struct plot_data *entry = pi->entry+i;
 		int val;
 
@@ -635,9 +645,9 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
 		if (entry[0].sec - entry[-1].sec) {
 			entry->velocity = velocity((entry[0].val - entry[-1].val) / (entry[0].sec - entry[-1].sec));
                         /* if our samples are short and we aren't too FAST*/
-			if (entry[0].sec - entry[-1].sec < 30 && entry->velocity < FAST) { 
+			if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) {
 				int past = -2;
-				while (i+past > 0 && entry[0].sec - entry[past].sec < 30)
+				while (i+past > 0 && entry[0].sec - entry[past].sec < 15)
 					past--;
 				entry->velocity = velocity((entry[0].val - entry[past].val) / 
 							(entry[0].sec - entry[past].sec));
@@ -704,7 +714,7 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	pi->nr = lastindex+1;
 	pi->maxtime = pi->entry[lastindex].sec;
 
-	pi->minpressure = dive->cylinder[0].end.mbar;
+	pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
 	pi->maxpressure = dive->cylinder[0].start.mbar;
 
 	pi->meandepth = dive->meandepth.mm;