<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 06/11/2016 17:31, Salvador Cuñat
wrote:<br>
</div>
<blockquote
cite="mid:CABxRwCB2jG3nzQ=s0kgpgg=bq5e6NZuGiPqWz31Sx-dKZyUPGg@mail.gmail.com"
type="cite">
<div dir="ltr">Hi Willem.<br>
<div>
<div class="gmail_extra"><br>
<div class="gmail_quote">2016-11-06 13:59 GMT+01:00 Willem
Ferguson <span dir="ltr"><<a moz-do-not-send="true"
target="_blank"
href="mailto:willemferguson@zoology.up.ac.za">willemferguson@zoology.up.ac.za</a>></span>:<br>
<blockquote style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex" class="gmail_quote">I
am updating some of the text for the user manual. two
questions:<br>
<br>
1) What does _File -> Take cloud storage online_ do?<br>
<br>
</blockquote>
<div>No idea about this.<br>
<br>
</div>
<blockquote style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex" class="gmail_quote">
2) If I download the same dive from two different dive
computers, Subsurface sees that and allows one to view
the different dive representations by selecting the
_Next DC_ or _Previous DC_ menu options. However, if I
plan a dive with the same date, time and location as a
logged dive, the plan and log are shown as separate
entries on the dive list. What determines whether two
representations of the same dive are considered as a
single dive with different dive computers?<br>
<br>
</blockquote>
<div>In core/dive.c :<br>
static int likely_same_dive(struct dive *a, struct dive
*b)<br>
{<br>
int match, fuzz = 20 * 60;<br>
<br>
/* don't merge manually added dives with
anything */<br>
if (same_string(a->dc.model, "manually added
dive") ||<br>
same_string(b->dc.model, "manually added
dive"))<br>
return 0;<br>
</div>
<div><br>
</div>
<div>This function runs every time a dive is imported from
a dc. Planned dives are marked "manually added" so they
don't automatically merge with dowloaded dives.<br>
</div>
<div> <br>
</div>
<div>BTW I don't think you make a dive and then plan it,
you're probably doing the correct way (plan then dive).
For sure this doubt came to you while working in the
manual ;-)<br>
<br>
</div>
<blockquote style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex" class="gmail_quote">
Can I save the dive plan and the corresponding log
without allowing the dive plan to count as an actual
dive?<br>
<br>
</blockquote>
<div> </div>
<div>Yes, you can.<br>
</div>
<div>Change the planned one so it has the same day/time
the real one has. Then merge the two dives. You will
end with a single dive which has the plan in the notes
and 2 profiles, the real one and the planned one. Then
edit as usual.<br>
<br>
</div>
<div>This may be a good tip in the manual for tech divers
who routinely plan their dives, so they can easily
compare their plans against their real dives just by
clicking the arrow keys left and right. <br>
</div>
</div>
<br>
</div>
<div class="gmail_extra">Regards.<br>
<br>
</div>
<div class="gmail_extra">Salva.<br>
</div>
</div>
</div>
<br>
</blockquote>
Hi Salva,<br>
<br>
Thanks for your idea. Did this but context menu has no merge option.
Screenshot attached. With real dive and dive plan on dive list, I
cannot merge, even with same date & time. Do I misunderstand
something? Looks to me as if plan is not recognised as a valid dive
to merge.<br>
Kind regards,<br>
willem<br>
</body>
</html>