[Patch] Fix planner notes gas change output logic

Wed Jun 17 12:26:32 PDT 2015

Robert, care to explain the postponed logic?

This set is from master.

Transition to 30 m in 1:40 min - runtime 1:40 on EAN32
Stay at 30 m for 28:20 min - runtime 30:00 on EAN32
Switch gas to air
Stay at 30 m for 30:00 min - runtime 60:00 on air
Switch gas to EAN32
Stay at 30 m for 30:00 min - runtime 90:00 on EAN32
Switch gas to EAN80
Stay at 9.0 m for 6:00 min - runtime 99:39 on EAN80
Stay at 6.0 m for 9:00 min - runtime 109:39 on EAN80
Stay at 3.0 m for 17:00 min - runtime 128:12 on EAN80
Transition to 0.0 m in 1:33 min - runtime 129:45 on EAN80

depth
duration
runtime
gas
30m
2min
2min
EAN32
30m
28min
30min

30m
30min
60min
EAN32
30m
30min
90min

9m
10min
100min
6m
10min
110min
EAN80
3m
19min
128min

0m
2min
130min

If we ignore the check for postponed on line 653 - 655 of planner.c this is the corresponding planner notes.
This looks much more like what I would expect from the verbatim notes on top.

depth
duration
runtime
gas
30m
2min
2min
EAN32
30m
28min
30min
air
30m
30min
60min
EAN32
30m
30min
90min

9m
10min
100min
EAN80
6m
10min
110min

3m
19min
128min

0m
2min
130min

Another thing, if the stop time is less than 1min at the switch depth the switch is displayed at the correct depth.

depth
duration
runtime
gas
40m
2min
2min
(24/25)
40m
23min
25min

9m
6min
31min

9m
1min
32min

6m
1min
33min

6m
22min
55min

0m
3min
58min

depth
duration
runtime
gas
40m
2min
2min
(24/25)
40m
23min
25min

9m
6min
31min
EAN80
6m
8min
39min

0m
3min
42min

2min stoptime @9m == wrong switch depth.
depth
duration
runtime
gas
40m
2min
2min
(24/25)
40m
24min
26min

9m
6min
32min

9m
2min
34min

6m
1min
35min

6m
24min
59min

0m
3min
62min

depth
duration
runtime
gas
40m
2min
2min
(24/25)
40m
24min
26min

9m
7min
33min
6m
8min
41min
EAN80
0m
3min
44min

/Jocke

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150617/216b6b69/attachment.html>