Hi Dirk and Robert, On 23 June 2015 at 10:53, Dirk Hohndel <[email protected]> wrote:
> > Because of some of the code cleanup that I did over the weekend these were > kinda hard to apply. I tried to close a few dozen Coverity issues and > ended up changing some of those very same conditional statements since > Coverity convinced me that it was possible for nextdp to be NULL... > > Please take a close look at what I just pushed to make sure I didn't end > up breaking things now that you finally got them right. > > With the latest master (and following commit 4094e6b233f967e2bd61f00cef8d53ce23811405, which was Robert's second patch, plus the changes to make things build again), we now don't handle the backgas breaks properly when not displaying transitions. I think the cleanup has left us missing out a gas change where the depth is constant, unless it was entered by the user (i.e. a backgas break). It did work with my local branch. E.g. 45m depth for 50min bottom time on air, with oxygen as only deco gas (GF = 45/85): depth duration runtime gas 45m 3min 3min air 45m 48min 50min 21m 6min 56min 18m 6min 62min 15m 8min 70min 12m 13min 83min 9m 20min 103min 6m 1min 104min oxygen 6m 18min 122min air ←-should still be O2 until 116min 6m 12min 134min oxygen 6m 6min 140min air 6m 4min 144min oxygen 0m 1min 145min The profile plot shows that the switch from O2 to air was at 116min. So does the verbatim output, or table output if transitions are shown. My local branch got it right: depth duration runtime gas 45m 3min 3min air 45m 48min 50min 21m 6min 56min 18m 6min 62min 15m 8min 70min 12m 13min 83min 9m 20min 103min 6m 13min 116min oxygen 6m 6min 122min air 6m 12min 134min oxygen 6m 6min 140min air 6m 4min 144min oxygen 0m 1min 145min I *think* the offending change is within the huge stack of conditional statements in lines 644-680. I believe I have got my head around it and will send a patch tonight my time. Rick
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
