[PATCH] Make relative times default in planner 2

Robert Helling helling at atdotde.de
Sat Mar 23 08:19:07 PDT 2013


In planning you usually plan lengths of segments rather than runtimes to
leave a level.

This patch superseeds a previous one with a similar name and (even more)
broken spacing.

Signed-off-by: Robert C. Helling <helling at atdotde.de>

---
planner.c |   10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/planner.c b/planner.c
index 012a23a..17c099c 100644
--- a/planner.c
+++ b/planner.c
@@ -832,13 +832,19 @@ static int validate_time(const char *text, int *sec_p, int *rel_p)
	while (g_ascii_isspace(*text))
		text++;

-	rel = 0;
+	rel = 1;
	if (*text == '+') {
		rel = 1;
		text++;
		while (g_ascii_isspace(*text))
			text++;
	}
+	else if (*text == '@') {
+		rel = 0;
+		text++;
+		while (g_ascii_isspace(*text))
+			text++;
+	}

	min = strtol(text, &end, 10);
	if (text == end)
@@ -1269,7 +1275,7 @@ void input_plan()
	char *explanationtext = _("<small>Add segments below.\nEach line describes part of the planned dive.\n"
			"An entry with depth, time and gas describes a segment that ends "
			"at the given depth, takes the given time (if relative, e.g. '+3:30') "
-			"or ends at the given time (if absolute), and uses the given gas.\n"
+			"or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
			"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
			"An entry that has a depth and a gas given but no time is special; it "
			"informs the planner that the gas specified is available for the ascent "
-- 
1.7.4.4



More information about the subsurface mailing list