X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=3ad11c0d0e97e4273f150ec5190a6ec42753105b;hb=03eb488dd238bcec4b4758eab4559b3c40e6435c;hp=5e603f8984e22e08065b3e4056d4b6e00eade54e;hpb=0a7fa8ea50ad65b350ebcc435dd47eae02d8bcbe;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 5e603f8..3ad11c0 100644
--- a/profile.c
+++ b/profile.c
@@ -14,6 +14,7 @@
 #include "color.h"
 
 int selected_dive = 0;
+char zoomed_plot = 0;
 
 typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t;
 
@@ -180,18 +181,24 @@ static void dump_pi (struct plot_info *pi)
  * When showing dive profiles, we scale things to the
  * current dive. However, we don't scale past less than
  * 30 minutes or 90 ft, just so that small dives show
- * up as such.
- * If the dive time is shorter than 10 minutes we assume that
- * this has been an apnea dive and display it accordingly.
- * we also need to add 180 seconds at the end so the min/max
+ * up as such unless zoom is enabled.
+ * We also need to add 180 seconds at the end so the min/max
  * plots correctly
  */
 static int get_maxtime(struct plot_info *pi)
 {
 	int seconds = pi->maxtime;
-	if (seconds < 600) {
-		/* Possible apnea dive, we scale accordingly */
-		return ROUND_UP(seconds+seconds/4, 60);
+	if (zoomed_plot) {
+		/* Rounded up to one minute, with at least 2.5 minutes to
+		 * spare.
+		 * For dive times shorter than 10 minutes, we use seconds/4 to
+		 * calculate the space dynamically.
+		 * This is seamless since 600/4 = 150.
+		 */
+		if ( seconds < 600 )
+			return ROUND_UP(seconds+seconds/4, 60);
+		else
+			return ROUND_UP(seconds+150, 60);
 	} else {
 		/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
 		return MAX(30*60, ROUND_UP(seconds+150, 60*5));
@@ -201,8 +208,13 @@ static int get_maxtime(struct plot_info *pi)
 static int get_maxdepth(struct plot_info *pi)
 {
 	unsigned mm = pi->maxdepth;
-	/* Minimum 30m, rounded up to 10m, with at least 3m to spare */
-	return MAX(30000, ROUND_UP(mm+3000, 10000));
+	if (zoomed_plot) {
+		/* Rounded up to 10m, with at least 3m to spare */
+		return ROUND_UP(mm+3000, 10000);
+	} else {
+		/* Minimum 30m, rounded up to 10m, with at least 3m to spare */
+		return MAX(30000, ROUND_UP(mm+3000, 10000));
+	}
 }
 
 typedef struct {
@@ -450,27 +462,21 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 	int sec, depth;
 	struct plot_data *entry;
 	int maxtime, maxdepth, marker;
-	int increments[4] = { 5*60, 10*60, 15*60, 30*60 };
+	int increments[8] = { 10, 20, 30, 60, 5*60, 10*60, 15*60, 30*60 };
 
 	/* Get plot scaling limits */
 	maxtime = get_maxtime(pi);
 	maxdepth = get_maxdepth(pi);
-	/* We check whether this has been an apnea dive and overwrite
-	* the increments in order to get reasonable time markers */
-	if (maxtime < 600) {
-		increments[0] = 10;
-		increments[1] = 20;
-		increments[2] = 30;
-		increments[3] = 60;
-	}
-	/* Time markers: at most every 5 min, but no more than 12 markers
-	 * and for convenience we do 5, 10, 15 or 30 min intervals.
+
+	/* Time markers: at most every 10 seconds, but no more than 12 markers.
+	 * We start out with 10 seconds and increment up to 30 minutes,
+	 * depending on the dive time.
 	 * This allows for 6h dives - enough (I hope) for even the craziest
 	 * divers - but just in case, for those 8h depth-record-breaking dives,
 	 * we double the interval if this still doesn't get us to 12 or fewer
 	 * time markers */
 	i = 0;
-	while (maxtime / increments[i] > 12 && i < 4)
+	while (maxtime / increments[i] > 12 && i < 8)
 		i++;
 	incr = increments[i];
 	while (maxtime / incr > 12)
@@ -490,13 +496,13 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 	/* now the text on the time markers */
 	text_render_options_t tro = {10, TIME_TEXT, CENTER, TOP};
 	if (maxtime < 600) {
-		/* Be a bit more verbose with shorter (apnea) dives */
+		/* Be a bit more verbose with shorter dives */
 		for (i = incr; i < maxtime; i += incr)
-		plot_text(gc, &tro, i, 1, "%d:%d", i/60, i%60);
+			plot_text(gc, &tro, i, 1, "%02d:%02d", i/60, i%60);
 	} else {
 		/* Only render the time on every second marker for normal dives */
 		for (i = incr; i < maxtime; i += 2 * incr)
-		plot_text(gc, &tro, i, 1, "%d", i/60);
+			plot_text(gc, &tro, i, 1, "%d", i/60);
 	}
 	/* Depth markers: every 30 ft or 10 m*/
 	gc->leftx = 0; gc->rightx = 1.0;
@@ -1068,16 +1074,18 @@ static void fill_missing_tank_pressures(struct plot_info *pi, pr_track_t **track
 				/* there may be multiple segments - so
 				 * let's assemble the length */
 				nlist = list;
-				pt = list->pressure_time;
-				while (!nlist->end) {
-					nlist = nlist->next;
-					if (!nlist) {
-						/* oops - we have no end pressure,
-						 * so this means this is a tank without
-						 * gas consumption information */
-						break;
+				if (list) {
+					pt = list->pressure_time;
+					while (!nlist->end) {
+						nlist = nlist->next;
+						if (!nlist) {
+							/* oops - we have no end pressure,
+							 * so this means this is a tank without
+							 * gas consumption information */
+							break;
+						}
+						pt += nlist->pressure_time;
 					}
-					pt += nlist->pressure_time;
 				}
 				if (!nlist) {
 					/* just continue without calculating
@@ -1374,12 +1382,15 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	int nr = dive->samples;
 
 	if (!nr) {
+		/* The dive has no samples, so create a few fake ones.  This assumes an
+		ascent/descent rate of 9 m/min, which is just below the limit for FAST. */
 		int duration = dive->duration.seconds;
 		int maxdepth = dive->maxdepth.mm;
+		int asc_desc_time = dive->maxdepth.mm*60/9000;
 		sample = fake;
-		fake[1].time.seconds = duration * 0.05;
+		fake[1].time.seconds = asc_desc_time;
 		fake[1].depth.mm = maxdepth;
-		fake[2].time.seconds = duration * 0.95;
+		fake[2].time.seconds = duration - asc_desc_time;
 		fake[2].depth.mm = maxdepth;
 		fake[3].time.seconds = duration * 1.00;
 		nr = 4;