<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 04/02/2017 15:31, Robert Helling
wrote:<br>
</div>
<blockquote
cite="mid:60414C37-E688-41B0-814F-DB0DAC7F7A88@atdotde.de"
type="cite">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Willem,
<div class=""><br class="">
</div>
<div class="">
<div>
<blockquote type="cite" class="">
<div class="">On 30.01.2017, at 07:44, Willem Ferguson <<a
moz-do-not-send="true"
href="mailto:willemferguson@zoology.up.ac.za" class="">willemferguson@zoology.up.ac.za</a>>
wrote:</div>
<br class="Apple-interchange-newline">
<div class=""><span style="font-family: Menlo-Regular;
font-size: 11px; font-style: normal; font-variant-caps:
normal; font-weight: normal; letter-spacing: normal;
orphans: auto; text-align: start; text-indent: 0px;
text-transform: none; white-space: normal; widows: auto;
word-spacing: 0px; -webkit-text-stroke-width: 0px;
float: none; display: inline !important;" class="">In
short, there are two problems: 1) The order in which the
gases are entered in the cylinder table has an effect on
the rendering of the data; 2) when saving a plan and
re-opening and editing it in the dive planner, the gas
changes are forgotten. Below are some images of a
stereotyped dive plan using the above approach.</span></div>
</blockquote>
</div>
<div class=""><br class="">
</div>
I just issued a pull request on Github that I hope addresses all
the issues you reported. Could you please verify?</div>
<div class=""><br class="">
</div>
<div class="">Please see <a moz-do-not-send="true"
href="https://github.com/Subsurface-divelog/subsurface/pull/191"
class="">https://github.com/Subsurface-divelog/subsurface/pull/191</a></div>
<div class=""><br class="">
</div>
<div class="">Thanks </div>
<div class="">Robert</div>
</blockquote>
Robert,<br>
Just did a number of tests to merge dives and their dive plans. Gave
it a fairly thorough test I believe, merging seven dives and their
plans during my last dive trip. Everything is ok as far as I can
see. I think you pulled a rabbit out of a hat. Thanks.<br>
<br>
Two comments on the above:<br>
1) A very small issue, also depends on personal preferences. After a
merge, the deepest depth of the two profiles are shown in the dive
table. This is likely to throw off the statistics for real dives. My
personal preference would be to show the depth of the first dive,
even if the dive plan may have been for a dive 4 or 5 meters deeper.
In my case the first dive is the real dive and the second one is the
dive plan.<br>
<br>
2) In the dive notes the concatenation of notes for the real dive
and for the dive plan are done as <font color="#ff0000">(</font>Real
dive notes<font color="#ff0000">) or (</font>Dive plan text<font
color="#ff0000">)</font><br>
The text in red, above, is actually printed as part of the dive
notes.<br>
<br>
I will keep an eye on the the latest pull request of yours and
respond.<br>
Thank you for your time.<br>
Kind regards,<br>
willem<br>
<br>
<br>
</body>
</html>