[PATCH 2/5] Remove the special handling of ndl < 3m

Anton Lundin glance at acc.umu.se
Tue Nov 12 14:09:58 UTC 2013


This changes from a special handling of ndl calculations when we
deem that we are to shallow for doing them. Previously we just sat ndl
to -1 and printed a -, now we return and print max_ndl, just as how most
divecomputers work.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 profile.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/profile.c b/profile.c
index 303da69..d32363b 100644
--- a/profile.c
+++ b/profile.c
@@ -1076,7 +1076,7 @@ static void calculate_deco_information(struct dive *dive, struct divecomputer *d
 			/* FIXME: This should be configurable */
 			const int time_stepsize = 60;
 			const int max_ndl = 7200;
-			entry->ndl = -1;
+			entry->ndl = max_ndl;
 			pi->has_ndl = TRUE;
 
 			/* don't try to calculate a ndl for lower values than 3m
@@ -1253,10 +1253,7 @@ static void plot_string(struct plot_data *entry, char *buf, int bufsize,
 		snprintf(buf, bufsize, translate("gettextFromC","%s\nIn deco"), buf2);
 	} else if (has_ndl) {
 		memcpy(buf2, buf, bufsize);
-		if (entry->ndl == -1)
-			snprintf(buf, bufsize, translate("gettextFromC","%s\nNDL:-"), buf2);
-		else
-			snprintf(buf, bufsize, translate("gettextFromC","%s\nNDL:%umin"), buf2, DIV_UP(entry->ndl, 60));
+		snprintf(buf, bufsize, translate("gettextFromC","%s\nNDL:%umin"), buf2, DIV_UP(entry->ndl, 60));
 	}
 	if (entry->sac && prefs.show_sac) {
 		memcpy(buf2, buf, bufsize);
-- 
1.8.3.2



More information about the subsurface mailing list