Merge branch 'cns' into cns-merge

I foolishly changed visible_columns in both the (ill-named) cns branch and
master...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	divelist.c
	gtk-gui.c
	profile.c

1 files changed, 7 insertions, 0 deletions

diff --git a/dive.c b/dive.c
index b197c835f..4dbf979b3 100644
--- a/dive.c
+++ b/dive.c
@@ -419,6 +419,7 @@ struct dive *fixup_dive(struct dive *dive)
 	add_location(dive->location);
 	add_suit(dive->suit);
 	sanitize_cylinder_info(dive);
+	dive->maxcns = dive->cns;
 	dc = &dive->dc;
 	for (i = 0; i < dc->samples; i++) {
 		struct sample *sample = dc->sample + i;
@@ -479,6 +480,8 @@ struct dive *fixup_dive(struct dive *dive)
 		depthtime += (time - lasttime) * (lastdepth + depth) / 2;
 		lastdepth = depth;
 		lasttime = time;
+		if (sample->cns > dive->maxcns)
+			dive->maxcns = sample->cns;
 	}
 	dive->start = start;
 	dive->end = end;
@@ -708,6 +711,10 @@ add_sample_b:
 			sample.cylinderpressure = as->cylinderpressure;
 		if (as->cylinderindex)
 			sample.cylinderindex = as->cylinderindex;
+		if (as->cns)
+			sample.cns = as->cns;
+		if (as->po2)
+			sample.po2 = as->po2;
 
 		merge_one_sample(&sample, at, res);