diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-14 09:19:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-16 07:46:47 -0700 |
| commit | ed9e5fe0f3121217ddfe7391191a2482b1f028c2 (patch) | |
| tree | 66109ef06a62ef067f1cdf212c7ec76c5b469d54 /Documentation/user-manual_fr.html.git | |
| parent | e32ae20ca3e5dea67613b330a822cd18556d076a (diff) | |
| download | subsurface-ed9e5fe0f3121217ddfe7391191a2482b1f028c2.tar.gz | |
Don't use CRLF in documentation files
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation/user-manual_fr.html.git')
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 6656 |
1 files changed, 3328 insertions, 3328 deletions
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index f6bcf6fe6..128f62872 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -1,5 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> @@ -7,461 +7,461 @@ <title></title> <style type="text/css"> /* - * compact_subsurface.css, a special style sheet for Subsurface,
- * modified by Willem Ferguson and derived from:
- * compact.css, version 1.3 by Alex Efros <powerman@powerman.name>
- * Licence: Public Domain
- *
- * Usage: asciidoc -a theme=compact_subsurface ...
- */
-
-* { padding: 0; margin: 0; }
-img { border: 0; }
-
-/*** Layout ***/
-
-body { margin: 10px 20px; }
-#header br { display: none; }
-#revnumber { display: block; }
-#toc { margin: 1em 0; }
-.toclevel2 { margin-left: 1em; }
-.toclevel3 { margin-left: 2em; }
-#footer { margin-top: 2em; }
-
-#preamble .sectionbody,
-h2,
-h3,
-h4,
-h5 { margin: 1em 0 0 0; }
-
-.admonitionblock,
-.listingblock,
-.sidebarblock,
-.exampleblock,
-.tableblock,
-.literalblock { margin: 1em 0; }
-.admonitionblock td.icon { padding-right: 0.5em; }
-.admonitionblock td.content { padding-left: 0.5em; }
-.listingblock .content { padding: 0.5em; }
-.sidebarblock > .content { padding: 0.5em; }
-.exampleblock > .content { padding: 0 0.5em; }
-.tableblock caption { padding: 0 0 0.5em 0; }
-.tableblock thead th,
-.tableblock tbody td,
-.tableblock tfoot td { padding: 0 0.5em; }
-.quoteblock { padding: 0 2.0em; }
-
-.paragraph { margin: 1em 0 0 0; }
-.sidebarblock .paragraph:first-child,
-.exampleblock .paragraph:first-child,
-.admonitionblock .paragraph:first-child { margin: 0; }
-
- .ulist, .olist, .dlist, .hdlist, .qlist { margin: 1em 0; }
-li .ulist, li .olist, li .dlist, li .hdlist, li .qlist,
-dd .ulist, dd .olist, dd .dlist, dd .hdlist, dd .qlist { margin: 0; }
-ul { margin-left: 1.5em; }
-ol { margin-left: 2em; }
-dd { margin-left: 3em; }
-td.hdlist1 { padding-right: 1em; }
-
-/*** Fonts ***/
-
-body { font-family: Verdana, sans-serif; }
-#header { font-family: Arial, sans-serif; }
-#header h1 { font-family: Arial, sans-serif; }
-#footer { font-family: Georgia, serif; }
-#email { font-size: 0.85em; }
-#revnumber { font-size: 0.75em; }
-#toc { font-size: 0.9em; }
-#toctitle { font-weight: bold; }
-#footer { font-size: 0.8em; }
-
-h2, h3, h4, h5, .title { font-family: Arial, sans-serif; }
-h2 { font-size: 1.5em; }
-.sectionbody { font-size: 0.85em; }
-.sectionbody .sectionbody { font-size: inherit; }
-h3 { font-size: 159%; } /* 1.35em */
-h4 { font-size: 141%; } /* 1.2em */
-h5 { font-size: 118%; } /* 1em */
-.title { font-size: 106%; /* 0.9em */
- font-weight: bold;
- }
-
-tt, .monospaced { font-family: monospace; font-size: 106%; } /* 0.9em */
-dt, td.hdlist1, .qlist em { font-family: Times New Roman, serif;
- font-size: 118%; /* 1em */
- font-style: italic;
- }
-.tableblock tfoot td { font-weight: bold; }
-
-/*** Colors and Backgrounds ***/
-
-h1 { color: #527bbd; border-bottom: 2px solid silver; }
-#footer { border-top: 2px solid silver; }
-
-h2 { color: #527bbd; border-bottom: 2px solid silver; }
-h3 { color: #5D7EAE; border-bottom: 2px solid silver; }
-h3 { display: inline-block; }
-h4,h5 { color: #5D7EAE; }
-
-.admonitionblock td.content { border-left: 2px solid silver; }
-.listingblock .content { background: #f4f4f4; border: 1px solid silver; border-left: 5px solid #e0e0e0; }
-.sidebarblock > .content { background: #ffffee; border: 1px solid silver; border-left: 5px solid #e0e0e0; }
-.exampleblock > .content { border-left: 2px solid silver; }
-.quoteblock { border-left: 5px solid #e0e0e0; }
-.tableblock table {
- border-collapse: collapse;
- border-width: 3px;
- border-color: #527bbd;
-}
-.tableblock table[frame=hsides] { border-style: solid none; }
-.tableblock table[frame=border] { border-style: solid; }
-.tableblock table[frame=void] { border-style: none; }
-.tableblock table[frame=vsides] { border-style: none solid; }
-.tableblock table[rules=all] tbody tr *,
-.tableblock table[rules=rows] tbody tr * {
- border-top: 1px solid #527bbd;
-}
-.tableblock table[rules=all] tr *,
-.tableblock table[rules=cols] tr * {
- border-left: 1px solid #527bbd;
-}
-.tableblock table tbody tr:first-child * {
- border-top: 1px solid white; /* none don't work here... %-[] */
-}
-.tableblock table tr *:first-child {
- border-left: none;
-}
-.tableblock table[frame] thead tr *,
-.tableblock table[frame] thead tr * {
- border-top: 1px solid white;
- border-bottom: 2px solid #527bbd;
-}
-.tableblock table tr td p.table,
-.tableblock table tr td p.table * {
- border: 0px;
-}
-
-tt, .monospaced { color: navy; }
-
-li { color: #a0a0a0; }
-li > * { color: black; }
-
-span.aqua { color: aqua; }
-span.black { color: black; }
-span.blue { color: blue; }
-span.fuchsia { color: fuchsia; }
-span.gray { color: gray; }
-span.green { color: green; }
-span.lime { color: lime; }
-span.maroon { color: maroon; }
-span.navy { color: navy; }
-span.olive { color: olive; }
-span.purple { color: purple; }
-span.red { color: red; }
-span.silver { color: silver; }
-span.teal { color: teal; }
-span.white { color: white; }
-span.yellow { color: yellow; }
-
-span.aqua-background { background: aqua; }
-span.black-background { background: black; }
-span.blue-background { background: blue; }
-span.fuchsia-background { background: fuchsia; }
-span.gray-background { background: gray; }
-span.green-background { background: green; }
-span.lime-background { background: lime; }
-span.maroon-background { background: maroon; }
-span.navy-background { background: navy; }
-span.olive-background { background: olive; }
-span.purple-background { background: purple; }
-span.red-background { background: red; }
-span.silver-background { background: silver; }
-span.teal-background { background: teal; }
-span.white-background { background: white; }
-span.yellow-background { background: yellow; }
-
-span.big { font-size: 2em; }
-span.small { font-size: 0.6em; }
-
-span.underline { text-decoration: underline; }
-span.overline { text-decoration: overline; }
-span.line-through { text-decoration: line-through; }
-
-/*** Misc ***/
-
-.admonitionblock td.icon { vertical-align: top; }
-.attribution { text-align: right; }
-
-ul { list-style-type: disc; }
-ol.arabic { list-style-type: decimal; }
-ol.loweralpha { list-style-type: lower-alpha; }
-ol.upperalpha { list-style-type: upper-alpha; }
-ol.lowerroman { list-style-type: lower-roman; }
-ol.upperroman { list-style-type: upper-roman; }
-.hdlist td { vertical-align: top; }
-
-
-@media screen {
- body {
- max-width: 50em; /* approximately 80 characters wide */
- margin-left: 16em;
- }
-
- #toc {
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- width: 13em;
- padding: 0.5em;
- padding-bottom: 1.5em;
- margin: 0;
- overflow: auto;
- border-right: 3px solid #f8f8f8;
- background-color: white;
- }
-
- #toc .toclevel1 {
- margin-top: 0.5em;
- }
-
- #toc .toclevel2 {
- margin-top: 0.25em;
- display: list-item;
- color: #aaaaaa;
- }
-
- #toctitle {
- margin-top: 0.5em;
- }
-}
-</style>
-<script type="text/javascript">
-/*<+'])');
- // Function that scans the DOM tree for header elements (the DOM2
- // nodeIterator API would be a better technique but not supported by all
- // browsers).
- var iterate = function (el) {
- for (var i = el.firstChild; i != null; i = i.nextSibling) {
- if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
- var mo = re.exec(i.tagName);
- if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
- result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
- }
- iterate(i);
- }
- }
- }
- iterate(el);
- return result;
- }
-
- var toc = document.getElementById("toc");
- if (!toc) {
- return;
- }
-
- // Delete existing TOC entries in case we're reloading the TOC.
- var tocEntriesToRemove = [];
- var i;
- for (i = 0; i < toc.childNodes.length; i++) {
- var entry = toc.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div'
- && entry.getAttribute("class")
- && entry.getAttribute("class").match(/^toclevel/))
- tocEntriesToRemove.push(entry);
- }
- for (i = 0; i < tocEntriesToRemove.length; i++) {
- toc.removeChild(tocEntriesToRemove[i]);
- }
-
- // Rebuild TOC entries.
- var entries = tocEntries(document.getElementById("content"), toclevels);
- for (var i = 0; i < entries.length; ++i) {
- var entry = entries[i];
- if (entry.element.id == "")
- entry.element.id = "_toc_" + i;
- var a = document.createElement("a");
- a.href = "#" + entry.element.id;
- a.appendChild(document.createTextNode(entry.text));
- var div = document.createElement("div");
- div.appendChild(a);
- div.className = "toclevel" + entry.toclevel;
- toc.appendChild(div);
- }
- if (entries.length == 0)
- toc.parentNode.removeChild(toc);
-},
-
-
-/////////////////////////////////////////////////////////////////////
-// Footnotes generator
-/////////////////////////////////////////////////////////////////////
-
-/* Based on footnote generation code from:
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
- */
-
-footnotes: function () {
- // Delete existing footnote entries in case we're reloading the footnodes.
- var i;
- var noteholder = document.getElementById("footnotes");
- if (!noteholder) {
- return;
- }
- var entriesToRemove = [];
- for (i = 0; i < noteholder.childNodes.length; i++) {
- var entry = noteholder.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
- entriesToRemove.push(entry);
- }
- for (i = 0; i < entriesToRemove.length; i++) {
- noteholder.removeChild(entriesToRemove[i]);
- }
-
- // Rebuild footnote entries.
- var cont = document.getElementById("content");
- var spans = cont.getElementsByTagName("span");
- var refs = {};
- var n = 0;
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnote") {
- n++;
- var note = spans[i].getAttribute("data-note");
- if (!note) {
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- spans[i].setAttribute("data-note", note);
- }
- noteholder.innerHTML +=
- "<div class='footnote' id='_footnote_" + n + "'>" +
- "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
- n + "</a>. " + note + "</div>";
- var id =spans[i].getAttribute("id");
- if (id != null) refs["#"+id] = n;
- }
- }
- if (n == 0)
- noteholder.parentNode.removeChild(noteholder);
- else {
- // Process footnoterefs.
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnoteref") {
- var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
- href = href.match(/#.*/)[0]; // Because IE return full URL.
- n = refs[href];
- spans[i].innerHTML =
- "[<a href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- }
- }
- }
-},
-
-install: function(toclevels) {
- var timerId;
-
- function reinstall() {
- asciidoc.footnotes();
- if (toclevels) {
- asciidoc.toc(toclevels);
- }
- }
-
- function reinstallAndRemoveTimer() {
- clearInterval(timerId);
- reinstall();
- }
-
- timerId = setInterval(reinstall, 500);
- if (document.addEventListener)
- document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
- else
- window.onload = reinstallAndRemoveTimer;
-}
-
-}
-asciidoc.install(3);
-/*]]>*/
-</script>
-</head>
-<body class="article">
-<div id="header">
-</div>
-<div id="content">
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Subsurface4Banner.jpg" alt="Banner" />
-</div>
-</div>
-<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div>
-<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
-Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.5, Octobre 2015</em></span></p></div>
-<div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé
-d’enregistrement de plongées (carnet de plongées) avec une bonne
-infrastructure pour décrire, organiser, interpréter et imprimer des plongées
-en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
-rapport à d’autres solutions logicielles similaires :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des
- équipements loisirs, même sans utiliser d’ordinateur de plongée ?
-</p>
-</li>
-<li>
-<p>
-Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun avec
- son propre logiciel propriétaire pour télécharger les enregistrements des
- plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert
+ * compact_subsurface.css, a special style sheet for Subsurface, + * modified by Willem Ferguson and derived from: + * compact.css, version 1.3 by Alex Efros <powerman@powerman.name> + * Licence: Public Domain + * + * Usage: asciidoc -a theme=compact_subsurface ... + */ + +* { padding: 0; margin: 0; } +img { border: 0; } + +/*** Layout ***/ + +body { margin: 10px 20px; } +#header br { display: none; } +#revnumber { display: block; } +#toc { margin: 1em 0; } +.toclevel2 { margin-left: 1em; } +.toclevel3 { margin-left: 2em; } +#footer { margin-top: 2em; } + +#preamble .sectionbody, +h2, +h3, +h4, +h5 { margin: 1em 0 0 0; } + +.admonitionblock, +.listingblock, +.sidebarblock, +.exampleblock, +.tableblock, +.literalblock { margin: 1em 0; } +.admonitionblock td.icon { padding-right: 0.5em; } +.admonitionblock td.content { padding-left: 0.5em; } +.listingblock .content { padding: 0.5em; } +.sidebarblock > .content { padding: 0.5em; } +.exampleblock > .content { padding: 0 0.5em; } +.tableblock caption { padding: 0 0 0.5em 0; } +.tableblock thead th, +.tableblock tbody td, +.tableblock tfoot td { padding: 0 0.5em; } +.quoteblock { padding: 0 2.0em; } + +.paragraph { margin: 1em 0 0 0; } +.sidebarblock .paragraph:first-child, +.exampleblock .paragraph:first-child, +.admonitionblock .paragraph:first-child { margin: 0; } + + .ulist, .olist, .dlist, .hdlist, .qlist { margin: 1em 0; } +li .ulist, li .olist, li .dlist, li .hdlist, li .qlist, +dd .ulist, dd .olist, dd .dlist, dd .hdlist, dd .qlist { margin: 0; } +ul { margin-left: 1.5em; } +ol { margin-left: 2em; } +dd { margin-left: 3em; } +td.hdlist1 { padding-right: 1em; } + +/*** Fonts ***/ + +body { font-family: Verdana, sans-serif; } +#header { font-family: Arial, sans-serif; } +#header h1 { font-family: Arial, sans-serif; } +#footer { font-family: Georgia, serif; } +#email { font-size: 0.85em; } +#revnumber { font-size: 0.75em; } +#toc { font-size: 0.9em; } +#toctitle { font-weight: bold; } +#footer { font-size: 0.8em; } + +h2, h3, h4, h5, .title { font-family: Arial, sans-serif; } +h2 { font-size: 1.5em; } +.sectionbody { font-size: 0.85em; } +.sectionbody .sectionbody { font-size: inherit; } +h3 { font-size: 159%; } /* 1.35em */ +h4 { font-size: 141%; } /* 1.2em */ +h5 { font-size: 118%; } /* 1em */ +.title { font-size: 106%; /* 0.9em */ + font-weight: bold; + } + +tt, .monospaced { font-family: monospace; font-size: 106%; } /* 0.9em */ +dt, td.hdlist1, .qlist em { font-family: Times New Roman, serif; + font-size: 118%; /* 1em */ + font-style: italic; + } +.tableblock tfoot td { font-weight: bold; } + +/*** Colors and Backgrounds ***/ + +h1 { color: #527bbd; border-bottom: 2px solid silver; } +#footer { border-top: 2px solid silver; } + +h2 { color: #527bbd; border-bottom: 2px solid silver; } +h3 { color: #5D7EAE; border-bottom: 2px solid silver; } +h3 { display: inline-block; } +h4,h5 { color: #5D7EAE; } + +.admonitionblock td.content { border-left: 2px solid silver; } +.listingblock .content { background: #f4f4f4; border: 1px solid silver; border-left: 5px solid #e0e0e0; } +.sidebarblock > .content { background: #ffffee; border: 1px solid silver; border-left: 5px solid #e0e0e0; } +.exampleblock > .content { border-left: 2px solid silver; } +.quoteblock { border-left: 5px solid #e0e0e0; } +.tableblock table { + border-collapse: collapse; + border-width: 3px; + border-color: #527bbd; +} +.tableblock table[frame=hsides] { border-style: solid none; } +.tableblock table[frame=border] { border-style: solid; } +.tableblock table[frame=void] { border-style: none; } +.tableblock table[frame=vsides] { border-style: none solid; } +.tableblock table[rules=all] tbody tr *, +.tableblock table[rules=rows] tbody tr * { + border-top: 1px solid #527bbd; +} +.tableblock table[rules=all] tr *, +.tableblock table[rules=cols] tr * { + border-left: 1px solid #527bbd; +} +.tableblock table tbody tr:first-child * { + border-top: 1px solid white; /* none don't work here... %-[] */ +} +.tableblock table tr *:first-child { + border-left: none; +} +.tableblock table[frame] thead tr *, +.tableblock table[frame] thead tr * { + border-top: 1px solid white; + border-bottom: 2px solid #527bbd; +} +.tableblock table tr td p.table, +.tableblock table tr td p.table * { + border: 0px; +} + +tt, .monospaced { color: navy; } + +li { color: #a0a0a0; } +li > * { color: black; } + +span.aqua { color: aqua; } +span.black { color: black; } +span.blue { color: blue; } +span.fuchsia { color: fuchsia; } +span.gray { color: gray; } +span.green { color: green; } +span.lime { color: lime; } +span.maroon { color: maroon; } +span.navy { color: navy; } +span.olive { color: olive; } +span.purple { color: purple; } +span.red { color: red; } +span.silver { color: silver; } +span.teal { color: teal; } +span.white { color: white; } +span.yellow { color: yellow; } + +span.aqua-background { background: aqua; } +span.black-background { background: black; } +span.blue-background { background: blue; } +span.fuchsia-background { background: fuchsia; } +span.gray-background { background: gray; } +span.green-background { background: green; } +span.lime-background { background: lime; } +span.maroon-background { background: maroon; } +span.navy-background { background: navy; } +span.olive-background { background: olive; } +span.purple-background { background: purple; } +span.red-background { background: red; } +span.silver-background { background: silver; } +span.teal-background { background: teal; } +span.white-background { background: white; } +span.yellow-background { background: yellow; } + +span.big { font-size: 2em; } +span.small { font-size: 0.6em; } + +span.underline { text-decoration: underline; } +span.overline { text-decoration: overline; } +span.line-through { text-decoration: line-through; } + +/*** Misc ***/ + +.admonitionblock td.icon { vertical-align: top; } +.attribution { text-align: right; } + +ul { list-style-type: disc; } +ol.arabic { list-style-type: decimal; } +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { list-style-type: upper-alpha; } +ol.lowerroman { list-style-type: lower-roman; } +ol.upperroman { list-style-type: upper-roman; } +.hdlist td { vertical-align: top; } + + +@media screen { + body { + max-width: 50em; /* approximately 80 characters wide */ + margin-left: 16em; + } + + #toc { + position: fixed; + top: 0; + left: 0; + bottom: 0; + width: 13em; + padding: 0.5em; + padding-bottom: 1.5em; + margin: 0; + overflow: auto; + border-right: 3px solid #f8f8f8; + background-color: white; + } + + #toc .toclevel1 { + margin-top: 0.5em; + } + + #toc .toclevel2 { + margin-top: 0.25em; + display: list-item; + color: #aaaaaa; + } + + #toctitle { + margin-top: 0.5em; + } +} +</style> +<script type="text/javascript"> +/*<+'])'); + // Function that scans the DOM tree for header elements (the DOM2 + // nodeIterator API would be a better technique but not supported by all + // browsers). + var iterate = function (el) { + for (var i = el.firstChild; i != null; i = i.nextSibling) { + if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { + var mo = re.exec(i.tagName); + if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { + result[result.length] = new TocEntry(i, getText(i), mo[1]-1); + } + iterate(i); + } + } + } + iterate(el); + return result; + } + + var toc = document.getElementById("toc"); + if (!toc) { + return; + } + + // Delete existing TOC entries in case we're reloading the TOC. + var tocEntriesToRemove = []; + var i; + for (i = 0; i < toc.childNodes.length; i++) { + var entry = toc.childNodes[i]; + if (entry.nodeName.toLowerCase() == 'div' + && entry.getAttribute("class") + && entry.getAttribute("class").match(/^toclevel/)) + tocEntriesToRemove.push(entry); + } + for (i = 0; i < tocEntriesToRemove.length; i++) { + toc.removeChild(tocEntriesToRemove[i]); + } + + // Rebuild TOC entries. + var entries = tocEntries(document.getElementById("content"), toclevels); + for (var i = 0; i < entries.length; ++i) { + var entry = entries[i]; + if (entry.element.id == "") + entry.element.id = "_toc_" + i; + var a = document.createElement("a"); + a.href = "#" + entry.element.id; + a.appendChild(document.createTextNode(entry.text)); + var div = document.createElement("div"); + div.appendChild(a); + div.className = "toclevel" + entry.toclevel; + toc.appendChild(div); + } + if (entries.length == 0) + toc.parentNode.removeChild(toc); +}, + + +///////////////////////////////////////////////////////////////////// +// Footnotes generator +///////////////////////////////////////////////////////////////////// + +/* Based on footnote generation code from: + * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html + */ + +footnotes: function () { + // Delete existing footnote entries in case we're reloading the footnodes. + var i; + var noteholder = document.getElementById("footnotes"); + if (!noteholder) { + return; + } + var entriesToRemove = []; + for (i = 0; i < noteholder.childNodes.length; i++) { + var entry = noteholder.childNodes[i]; + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") + entriesToRemove.push(entry); + } + for (i = 0; i < entriesToRemove.length; i++) { + noteholder.removeChild(entriesToRemove[i]); + } + + // Rebuild footnote entries. + var cont = document.getElementById("content"); + var spans = cont.getElementsByTagName("span"); + var refs = {}; + var n = 0; + for (i=0; i<spans.length; i++) { + if (spans[i].className == "footnote") { + n++; + var note = spans[i].getAttribute("data-note"); + if (!note) { + // Use [\s\S] in place of . so multi-line matches work. + // Because JavaScript has no s (dotall) regex flag. + note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; + spans[i].innerHTML = + "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + + "' title='View footnote' class='footnote'>" + n + "</a>]"; + spans[i].setAttribute("data-note", note); + } + noteholder.innerHTML += + "<div class='footnote' id='_footnote_" + n + "'>" + + "<a href='#_footnoteref_" + n + "' title='Return to text'>" + + n + "</a>. " + note + "</div>"; + var id =spans[i].getAttribute("id"); + if (id != null) refs["#"+id] = n; + } + } + if (n == 0) + noteholder.parentNode.removeChild(noteholder); + else { + // Process footnoterefs. + for (i=0; i<spans.length; i++) { + if (spans[i].className == "footnoteref") { + var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); + href = href.match(/#.*/)[0]; // Because IE return full URL. + n = refs[href]; + spans[i].innerHTML = + "[<a href='#_footnote_" + n + + "' title='View footnote' class='footnote'>" + n + "</a>]"; + } + } + } +}, + +install: function(toclevels) { + var timerId; + + function reinstall() { + asciidoc.footnotes(); + if (toclevels) { + asciidoc.toc(toclevels); + } + } + + function reinstallAndRemoveTimer() { + clearInterval(timerId); + reinstall(); + } + + timerId = setInterval(reinstall, 500); + if (document.addEventListener) + document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false); + else + window.onload = reinstallAndRemoveTimer; +} + +} +asciidoc.install(3); +/*]]>*/ +</script> +</head> +<body class="article"> +<div id="header"> +</div> +<div id="content"> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Subsurface4Banner.jpg" alt="Banner" /> +</div> +</div> +<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div> +<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, +Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.5, Octobre 2015</em></span></p></div> +<div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé +d’enregistrement de plongées (carnet de plongées) avec une bonne +infrastructure pour décrire, organiser, interpréter et imprimer des plongées +en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par +rapport à d’autres solutions logicielles similaires :</p></div> +<div class="ulist"><ul> +<li> +<p> +Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des + équipements loisirs, même sans utiliser d’ordinateur de plongée ? +</p> +</li> +<li> +<p> +Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun avec + son propre logiciel propriétaire pour télécharger les enregistrements des + plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une interface standard pour télécharger les enregistrements des plongées à @@ -469,13 +469,13 @@ Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun ces enregistrements dans un système unique. </p> </li> -<li>
-<p>
-Utilisez-vous plus d’un système d’exploitation ? <em>Subsurface</em> est
- intégralement compatible avec Mac, Linux et Windows, ce qui vous permet
- d’accéder à vos enregistrements de plongées sur chaque système
- d’exploitation en utilisant une application unique.
-</p>
+<li> +<p> +Utilisez-vous plus d’un système d’exploitation ? <em>Subsurface</em> est + intégralement compatible avec Mac, Linux et Windows, ce qui vous permet + d’accéder à vos enregistrements de plongées sur chaque système + d’exploitation en utilisant une application unique. +</p> </li> <li> <p> @@ -483,9 +483,9 @@ Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n’a que des logiciels pour Windows pour télécharger les informations de plongées (par exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d’analyser vos enregistrements de plongées sur d’autres systèmes d’exploitation. -</p>
-</li>
-<li>
+</p> +</li> +<li> <p> Avez-vous besoin d’un planificateur de plongée graphique intuitif qui intègre et prend en compte les plongées qui ont déjà été enregistrées ? @@ -503,22 +503,22 @@ libdivecomputer sont disponibles. installer le logiciel, consultez la page <em>Téléchargement</em> sur le <a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de problème, vous pouvez envoyer un e-mail sur -<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et
-rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>. Pour
-des instructions de compilation du logiciel et (si besoin) de ses
-dépendances, merci de consulter le fichier INSTALL inclus dans les sources
-logicielles.</p></div>
-<div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs
-professionnels</p></div>
-<div id="toc">
- <div id="toctitle">Table of Contents</div>
- <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
-<div class="sect1">
-<h2 id="_utilisation_de_ce_manuel">1. Utilisation de ce manuel</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external
-controls for paging or selecting previous pages. However, two facilities are
+<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et +rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>. Pour +des instructions de compilation du logiciel et (si besoin) de ses +dépendances, merci de consulter le fichier INSTALL inclus dans les sources +logicielles.</p></div> +<div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs +professionnels</p></div> +<div id="toc"> + <div id="toctitle">Table of Contents</div> + <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript> +</div> +<div class="sect1"> +<h2 id="_utilisation_de_ce_manuel">1. Utilisation de ce manuel</h2> +<div class="sectionbody"> +<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external +controls for paging or selecting previous pages. However, two facilities are provided:</p></div> <div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the keyboard. A text box appears at the bottom right-hand of the window (see @@ -556,9 +556,9 @@ subsurface habits change and you wish to fill in another survey, just launch </div> </div> <div class="sect1"> -<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
+<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2> +<div class="sectionbody"> +<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les quatre panneaux sont :</p></div> @@ -635,7 +635,7 @@ before a new logbook is created.</p></div> <li> <p> Importer les informations de plongée qui ont été maintenues soit dans un - tableur
+ tableur soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D : Exporter un tableur vers le format CSV</a> et à <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>. @@ -647,16 +647,16 @@ imported from: <li> <p> L’ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer - de nouvelles informations de plongée à partir de l’ordinateur de plongée</a> ou
-</p>
-</li>
-<li>
-<p>
-Logiciels propriétaires fournis par les fabricants d’ordinateurs de
- plongée. Voir
- <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d’autres
- sources de données numériques ou d’autres formats de données</a>.
-</p>
+ de nouvelles informations de plongée à partir de l’ordinateur de plongée</a> ou +</p> +</li> +<li> +<p> +Logiciels propriétaires fournis par les fabricants d’ordinateurs de + plongée. Voir + <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d’autres + sources de données numériques ou d’autres formats de données</a>. +</p> </li> <li> <p> @@ -664,10 +664,10 @@ Spreadsheet or CSV files containing dive profiles. Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</a> </p> -</li>
-</ul></div>
-<div class="sect2">
-<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3>
+</li> +</ul></div> +<div class="sect2"> +<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3> <div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic record of information within <em>Subsurface</em> is a dive. The most important information in a simple dive logbook usually includes dive type, date, time, @@ -689,12 +689,12 @@ explained for data entry.</p></div> <strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the <strong>Notes</strong> panel (see the image below). This message is displayed in all the panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
-</div>
-</div>
-<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" /> +</div> +</div> +<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a dive have been entered. When entering dives by hand, the <em>Info</em>, <em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the information. By selecting the <em>Apply changes</em> button, a local copy of the @@ -753,9 +753,9 @@ top left hand of the <em>Subsurface</em> window should be used. Click on </div> </div> <div class="sect2"> -<h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l’ordinateur de plongée</h3>
-<div class="sect3">
-<h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4>
+<h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l’ordinateur de plongée</h3> +<div class="sect3"> +<h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4> <div class="paragraph"><p>The use of dive computers allows the collection of a large amount of information about each dive, e.g. a detailed record of depth, duration, rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can @@ -764,7 +764,7 @@ computers. The latest list of supported dive computers can be found at: <a href="http://subsurface-divelog.org/documentation/supported-dive-computers/"> Supported dive computers</a>.</p></div> <div class="admonitionblock"> -<table><tr>
+<table><tr> <td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> @@ -794,25 +794,25 @@ steps:</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> -The interface cable should be connected to a free USB port (or the Infra-red
- or Bluetooth connection set up as described later in this manual)
-</p>
-</li>
-<li>
-<p>
-The dive computer should be placed into PC Communication mode.
- (Se reporter au manuel de l’ordinateur de plongée)
-</p>
-</li>
-<li>
-<p>
-In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import From Dive
- Computer</em>. Dialogue <strong>A</strong> in the figure below appears:
-</p>
-</li>
-</ol></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+The interface cable should be connected to a free USB port (or the Infra-red + or Bluetooth connection set up as described later in this manual) +</p> +</li> +<li> +<p> +The dive computer should be placed into PC Communication mode. + (Se reporter au manuel de l’ordinateur de plongée) +</p> +</li> +<li> +<p> +In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import From Dive + Computer</em>. Dialogue <strong>A</strong> in the figure below appears: +</p> +</li> +</ol></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" /> </div> </div> @@ -825,19 +825,19 @@ those not charging while connected via USB).</p></div> <div class="ulist"><ul> <li> <p> -The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the
- <strong>vendor</strong> drop-down list select the make of the computer, e.g. Suunto,
- Oceanic, Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model
- name of the dive computer must be selected, e.g. D4 (Suunto), Veo200
- (Oceanic), or Puck (Mares).
-</p>
-</li>
-<li>
-<p>
-The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth
- port name that <em>Subsurface</em> needs in order to communicate with the dive
- computer. The appropriate port name must be selected. Consult
- <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix
+The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the + <strong>vendor</strong> drop-down list select the make of the computer, e.g. Suunto, + Oceanic, Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model + name of the dive computer must be selected, e.g. D4 (Suunto), Veo200 + (Oceanic), or Puck (Mares). +</p> +</li> +<li> +<p> +The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth + port name that <em>Subsurface</em> needs in order to communicate with the dive + computer. The appropriate port name must be selected. Consult + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a> and <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a> for technical details on how to find the appropriate port information for @@ -846,7 +846,7 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl </p> </li> <li> -<p>
+<p> If all the dives on the dive computer need to be downloaded, check the checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only downloads dives after the date-time of the last dive in the <strong>Dive List</strong> @@ -856,11 +856,11 @@ If all the dives on the dive computer need to be downloaded, check the (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the download in order to select only new dives. Consequently, for these dive computers, all dives are downloaded irrespective of the status of this check - box.
-</p>
-</li>
-<li>
-<p>
+ box. +</p> +</li> +<li> +<p> If the checkbox <em>Always prefer downloaded dives</em> has been checked and, during download, dives with identical date-times exist on the dive computer and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> @@ -868,12 +868,12 @@ If the checkbox <em>Always prefer downloaded dives</em> has been checked and, </p> </li> <li> -<p>
-The checkbox marked <em>Download into new trip</em> ensures that, after upload, the
- downloaded dives are grouped together as a new trip(s) in the <strong>Dive List</strong>.
-</p>
-</li>
-<li>
+<p> +The checkbox marked <em>Download into new trip</em> ensures that, after upload, the + downloaded dives are grouped together as a new trip(s) in the <strong>Dive List</strong>. +</p> +</li> +<li> <p> Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools @@ -907,28 +907,28 @@ List</strong>.</p></div> <div class="ulist"><ul> <li> <p> -If there is a problem in communicating with the dive computer, an error
- message will be shown, similar to this text: "Unable to open /dev/ttyUSB0
- Mares (Puck Pro)". Refer to the text in the box below.
-</p>
-</li>
-</ul></div>
-<div class="sidebarblock">
-<div class="content">
-<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Check the following:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Is the dive computer still in PC-communication or Upload mode?
-</p>
+If there is a problem in communicating with the dive computer, an error + message will be shown, similar to this text: "Unable to open /dev/ttyUSB0 + Mares (Puck Pro)". Refer to the text in the box below. +</p> +</li> +</ul></div> +<div class="sidebarblock"> +<div class="content"> +<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/important.png" alt="Important" /> +</td> +<td class="content">Check the following:</td> +</tr></table> +</div> +<div class="ulist"><ul> +<li> +<p> +Is the dive computer still in PC-communication or Upload mode? +</p> </li> <li> <p> @@ -951,11 +951,11 @@ Consult </p> </li> <li> -<p>
-On Unix-like operating systems, does the user have write permission to the
- USB port? If not, consult
- <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix
- A</a>
+<p> +On Unix-like operating systems, does the user have write permission to the + USB port? If not, consult + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix + A</a> </p> </li> </ul></div> @@ -978,11 +978,11 @@ When checking these boxes, the user is prompted to select a folder where the inf dive log is kept.</p></div> <div class="paragraph"><p><strong>Important:</strong> <em>After downloading with the above checkboxes checked, no dives are added to the -<strong>Dive List</strong> but two files are created in the folder selected above</em>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>subsurface.log
-subsurface.bin</code></pre>
+<strong>Dive List</strong> but two files are created in the folder selected above</em>:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>subsurface.log +subsurface.bin</code></pre> </div></div> <div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list: <em>subsurface@subsurface-divelog.org</em> with a request for the files to be @@ -1060,27 +1060,27 @@ computer being used.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
-computers that require a custom PIN code. In order to pair the devices, use
-other OS utilities as suggested below.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>$ bluetoothctl
-[bluetooth]# agent KeyboardOnly
-Agent registered
-[bluetooth]# default-agent
-Default agent request successful
-[bluetooth]# pair 00:80:25:49:6C:E3
-Attempting to pair with 00:80:25:49:6C:E3
-[CHG] Device 00:80:25:49:6C:E3 Connected: yes
-Request PIN code
+<table><tr> +<td class="icon"> +<img src="images/icons/important.png" alt="Important" /> +</td> +<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive +computers that require a custom PIN code. In order to pair the devices, use +other OS utilities as suggested below.</td> +</tr></table> +</div> +<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>$ bluetoothctl +[bluetooth]# agent KeyboardOnly +Agent registered +[bluetooth]# default-agent +Default agent request successful +[bluetooth]# pair 00:80:25:49:6C:E3 +Attempting to pair with 00:80:25:49:6C:E3 +[CHG] Device 00:80:25:49:6C:E3 Connected: yes +Request PIN code [agent] Enter PIN code: 0000</code></pre> </div></div> </div></div> @@ -1091,8 +1091,8 @@ shown on the righthand side of the download dialogue.</p></div> <div class="sect4"> <h5 id="_sur_windows">Sur Windows :</h5> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
+<div class="content"> +<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" /> </div> </div> <div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the @@ -1113,7 +1113,7 @@ button on the <em>Download</em> dialogue and wait for the process to complete.</ <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/important.png" alt="Important" />
+<img src="images/icons/important.png" alt="Important" /> </td> <td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet @@ -1126,22 +1126,22 @@ support the Microsoft Bluetooth Stack do work.</td> shows details about the current status of the Bluetooth agent. To select another dive computer for download using the "Remote Bluetooth selection dialogue" press the three-dots button from the <em>"Choose Bluetooth download -mode"</em> option.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content"><strong>IN CASE OF PROBLEMS</strong>: If the Bluetooth adapter from the <em>Subsurface</em> computer
-gets stuck and the <em>Download</em> process fails repeatedly,
- <em>unpair</em> the devices and then repeat the above steps. If this is not successful,
- <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains
-information for manually setting up and inspecting the Bluetooth connection
-with <em>Subsurface</em>.</td>
-</tr></table>
-</div>
-</div>
-</div>
+mode"</em> option.</p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/important.png" alt="Important" /> +</td> +<td class="content"><strong>IN CASE OF PROBLEMS</strong>: If the Bluetooth adapter from the <em>Subsurface</em> computer +gets stuck and the <em>Download</em> process fails repeatedly, + <em>unpair</em> the devices and then repeat the above steps. If this is not successful, + <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains +information for manually setting up and inspecting the Bluetooth connection +with <em>Subsurface</em>.</td> +</tr></table> +</div> +</div> +</div> <div class="sect3"> <h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4> <div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to @@ -1180,8 +1180,8 @@ edited. If you click on the <strong>Notes</strong> tab, the following fields are (left hand image, below):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />
-</div>
+<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" /> +</div> </div> <div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive information. The <strong>Time</strong> field reflects the date and time of the dive. By @@ -1197,11 +1197,11 @@ might be used for the air temperature. Generally this is close to the real air t If editing is required, only a value is required, the units of temperature will be automatically supplied by <em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will -be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>:</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+be used).</p></div> +<div class="paragraph"><p><strong>Location</strong>:</p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> <td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log. The dive @@ -1261,14 +1261,14 @@ Enter by hand if the coordinates are known, using one of four formats with </p> <div class="literalblock"> <div class="content"> -<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
-minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,
-e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,
-30.821798</code></pre>
-</div></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
+<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal +minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, +e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 , +30.821798</code></pre> +</div></div> +</li> +</ol></div> +<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a negative value, e.g. -30.22496. Similarly western longitudes are given with a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards don’t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d @@ -1344,8 +1344,8 @@ determines the behavior of the <strong>Dive profile</strong> (top right-hand pan <div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks like this:</p></div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
+<div class="content"> +<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" /> </div> </div> <div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive @@ -1369,13 +1369,13 @@ used for this dive, or just start typing in the box which shows the available options for the entered characters. The <strong>Size</strong> of the cylinder as well as its working pressure (<em>Work.press</em>) will automatically be shown in the dialogue.</p></div> -<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
-specified gas during the dive. The unit of pressure (metric/imperial)
-corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can
-be entered or this field can be left blank. If nitrox or trimix were used,
-their percentages of oxygen and/or helium should be entered. Any
-inappropriate fields should be left empty. After typing the information for
+<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the +specified gas during the dive. The unit of pressure (metric/imperial) +corresponds to the settings chosen in the <em>Preferences</em>.</p></div> +<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can +be entered or this field can be left blank. If nitrox or trimix were used, +their percentages of oxygen and/or helium should be entered. Any +inappropriate fields should be left empty. After typing the information for the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by clicking outside the cell containing the cursor. Information for any additional cylinders can be added by using the + button at the top right @@ -1392,15 +1392,15 @@ click the + button on the top right of the weights dialogue, the table looks like this:</p></div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through
-a down-arrow:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
+<div class="content"> +<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" /> +</div> +</div> +<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through +a down-arrow:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" /> </div> </div> <div class="paragraph"><p>This can be used to select the type of weight system used during the dive or @@ -1416,10 +1416,10 @@ weights: integrated as well as a weight belt:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" /> -</div>
-</div>
-</div>
-</div>
+</div> +</div> +</div> +</div> <div class="sect3"> <h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4> <div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of @@ -1448,13 +1448,13 @@ similar dives.</p></div> <div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a dive with all the appropriate information typed into the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log → Copy dive -components</em>. A box is presented with a selection of check boxes for most of
-the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Select the fields to be
-copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive
-List</strong>, select the dives into which this information is to be pasted. Then,
-from the main menu, select <em>Log → Paste dive components</em>. All the selected
-dives now contain the data initially selected in the original source dive
-log.</p></div>
+components</em>. A box is presented with a selection of check boxes for most of +the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Select the fields to be +copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive +List</strong>, select the dives into which this information is to be pasted. Then, +from the main menu, select <em>Log → Paste dive components</em>. All the selected +dives now contain the data initially selected in the original source dive +log.</p></div> </div> <div class="sect3"> <h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4> @@ -1470,16 +1470,16 @@ Right-click at the appropriate point on the dive profile. This brings up </p> </li> <li> -<p>
-Right-click on the red flag. This brings up the context menu (see <strong>B</strong>
- below). Select <em>Edit name</em>.
-</p>
-</li>
-<li>
-<p>
-A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong>
- below). Select <em>OK</em>. This saves the text associated with the bookmark.
-</p>
+<p> +Right-click on the red flag. This brings up the context menu (see <strong>B</strong> + below). Select <em>Edit name</em>. +</p> +</li> +<li> +<p> +A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong> + below). Select <em>OK</em>. This saves the text associated with the bookmark. +</p> </li> <li> <p> @@ -1488,14 +1488,14 @@ Hovering the mouse over the red bookmark, the appropriate text is shown at </p> </li> </ul></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4>
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" /> +</div> +</div> +</div> +<div class="sect3"> +<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4> <div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If the <em>Apply changes</em> button is clicked, the dive data are saved in the memory @@ -1548,64 +1548,64 @@ as in dialogue <strong>B</strong>, above. Currently these are:</p></div> <div class="ulist"><ul> <li> <p> -XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
- systems)
-</p>
-</li>
-<li>
-<p>
-Cochran dive logs
-</p>
-</li>
-<li>
-<p>
-UDDF-formatted dive logs (e.g. Kenozoooid)
-</p>
-</li>
-<li>
-<p>
-UDCF-formatted dive logs
-</p>
-</li>
-<li>
-<p>
-Poseidon MkVI CCR logs
-</p>
-</li>
-<li>
-<p>
-APD Inspiration/Evolution CCR logs
-</p>
-</li>
-<li>
-<p>
-LiquiVision logs
-</p>
-</li>
-<li>
-<p>
-divelog.de logs
-</p>
-</li>
-<li>
-<p>
-OSTC Tools logs
-</p>
-</li>
-<li>
-<p>
-JDiveLog
-</p>
-</li>
-<li>
-<p>
-Suunto Dive Manager (DM3 and DM4)
-</p>
-</li>
-<li>
-<p>
-CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
-</p>
+XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log + systems) +</p> +</li> +<li> +<p> +Cochran dive logs +</p> +</li> +<li> +<p> +UDDF-formatted dive logs (e.g. Kenozoooid) +</p> +</li> +<li> +<p> +UDCF-formatted dive logs +</p> +</li> +<li> +<p> +Poseidon MkVI CCR logs +</p> +</li> +<li> +<p> +APD Inspiration/Evolution CCR logs +</p> +</li> +<li> +<p> +LiquiVision logs +</p> +</li> +<li> +<p> +divelog.de logs +</p> +</li> +<li> +<p> +OSTC Tools logs +</p> +</li> +<li> +<p> +JDiveLog +</p> +</li> +<li> +<p> +Suunto Dive Manager (DM3 and DM4) +</p> +</li> +<li> +<p> +CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs +</p> </li> </ul></div> <div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large @@ -1618,8 +1618,8 @@ below.</p></div> <div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive data from the dive computer and stores it as a binary file with file -extension <em>.dive</em> . Subsurface can directly import these files when using
-the universal import dialogue. From the dropdown list at the bottom right
+extension <em>.dive</em> . Subsurface can directly import these files when using +the universal import dialogue. From the dropdown list at the bottom right select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive logs visible in the file list panel. Select one or more dive, then click the <em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div> @@ -1658,11 +1658,11 @@ Data should then be imported into <em>www.divelogs.de</em>. You will first need </p> </li> <li> -<p>
-Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the
- instructions below.
-</p>
-</li>
+<p> +Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the + instructions below. +</p> +</li> </ol></div> </div> <div class="sect3"> @@ -1679,7 +1679,7 @@ should then be selected, after which the imported dives appear in the <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" /> -</div>
+</div> </div> </div> <div class="sect3"> @@ -1692,8 +1692,8 @@ allows easy information exchange between different computers or software packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A Diver’s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be exported in <em>CSV</em> format to other software that reads this format. See -<a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for
-information that may be helpful for importing spreadsheet-based data into
+<a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for +information that may be helpful for importing spreadsheet-based data into <em>Subsurface</em>.</p></div> <div class="sect4"> <h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</h5> @@ -1702,9 +1702,9 @@ organized into a single line that provides the headers (or <em>field names</em> <em>column headings</em>) of the data columns, followed by the data, one record per line.</p></div> <div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into -<em>Subsurface</em>:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
+<em>Subsurface</em>:</p></div> +<div class="olist arabic"><ol class="arabic"> +<li> <p> <em>CSV dive details</em>: This dive log format contains similar information to that of a typical written dive log, e.g. dive date and time, dive depth, @@ -1732,27 +1732,27 @@ line.</p></div> know a few things about the data being imported</strong>:</p></div> <div class="olist loweralpha"><ol class="loweralpha"> <li> -<p>
-Which character separates the different columns within a single line of
- data? This field separator should be either a comma (,) a semicolon (;) or a
- TAB character. This can be determined by opening the file with a text
- editor. If it is comma-delimited or semicolon-delimited, the comma or
- semicolon characters between the values are clearly visible. If these are
- not evident and the numbers are aligned in columns, the file is probably
- TAB-delimited (i.e. it uses a TAB as a field separator).
-</p>
-</li>
-<li>
-<p>
-Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV dive
- details</em> file or a <em>CSV dive profile</em> file? Open the file using a text
- editor and note the titles of the columns to be imported and their column
- positions.
-</p>
-</li>
-<li>
-<p>
-Is the numeric information (e.g. dive depth) in metric or in imperial units?
+<p> +Which character separates the different columns within a single line of + data? This field separator should be either a comma (,) a semicolon (;) or a + TAB character. This can be determined by opening the file with a text + editor. If it is comma-delimited or semicolon-delimited, the comma or + semicolon characters between the values are clearly visible. If these are + not evident and the numbers are aligned in columns, the file is probably + TAB-delimited (i.e. it uses a TAB as a field separator). +</p> +</li> +<li> +<p> +Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV dive + details</em> file or a <em>CSV dive profile</em> file? Open the file using a text + editor and note the titles of the columns to be imported and their column + positions. +</p> +</li> +<li> +<p> +Is the numeric information (e.g. dive depth) in metric or in imperial units? </p> </li> </ol></div> @@ -1760,9 +1760,9 @@ Is the numeric information (e.g. dive depth) in metric or in imperial units? straightforward. Select <em>Import → Import Log Files</em> from the main menu. In the resulting file selection menu, select <em>CSV files</em> (towards the bottom right). This shows all .CSV files in the selected directory. Select the file -that needs to be imported. A configuration panel appears as depicted below:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+that needs to be imported. A configuration panel appears as depicted below:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/csv_import1_f20.jpg" alt="FIGURE: CSV download dialogue 1" /> </div> </div> @@ -1800,9 +1800,9 @@ panel.</p></div> <div class="sidebarblock" id="S_CSV_Intro"> <div class="content"> <div class="paragraph"><p><strong>A Diver’s Introduction to <em>CSV</em> Files</strong></p></div> -<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> <td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated @@ -1820,8 +1820,8 @@ some dive computers.</td> </tr></table> </div> <div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most -important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character
-used to separate fields within a single line. The field separator is
+important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character +used to separate fields within a single line. The field separator is frequently a comma, a colon, a SPACE character or a TAB character. When exporting data from spreadsheet software, the field separator needs to be specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally @@ -1829,46 +1829,46 @@ organized into a single line that provides the headers (or <em>field names</em>) the data columns, followed by the data, one record per line. Note that each field name may comprise more than one word separated by spaces; for instance <em>Dive site</em>, below. Here is an example of dive information for four dives -using a comma as a field separator:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Dive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy
-Illovo Beach,2012-11-23,10:45,46:15,18.4,John Smith
-Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald
-Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht
-Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre>
-</div></div>
-<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information
-in TAB-delimited format:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Dive site Dive date Time Dive_duration Dive_depth Dive buddy
-Illovo Beach 2012-11-23 10:45 46:15 18.4 John Smith
-Key Largo 2012-11-24 09:12 34:15 20.4 Jason McDonald
-Wismar Baltic 2012-12-01 10:13 35:27 15.4 Dieter Albrecht
-Pulau Weh 2012-12-20 09:46 55:56 38.6 Karaeng Bontonompo</code></pre>
-</div></div>
-<div class="paragraph"><p>It is clear why many people prefer the TAB-delimited format to the
-comma-delimited format. The disadvantage is that one cannot see the TAB
-characters. For instance, the space between <em>Dive</em> and <em>date</em> in the top
-line may be a SPACE character or a TAB character (in this case it is a SPACE
-character: the tabs are before and after <em>Dive date</em>). If the field names in
-the first line are long, the alignment with data in the other lines cannot
-be maintained. Here is a highly simplified and shortened TAB-delimited
-example of a <em>CSV</em> dive log from an APD closed-circuit rebreather (CCR) dive
-computer:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Dive Time (s) Depth (m) pO₂ - Setpoint (Bar) pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius)
-0 0.0 0.70 0.81 13.1
-0 1.2 0.70 0.71 13.1
-0 0.0 0.70 0.71 13.1
-0 1.2 0.70 0.71 13.2
-0 1.2 0.70 0.71 13.1
-10 1.6 0.70 0.72 12.7
-20 1.6 0.70 0.71 12.6
-30 1.7 0.70 0.71 12.6
-40 1.8 0.70 0.68 12.5</code></pre>
+using a comma as a field separator:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Dive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy +Illovo Beach,2012-11-23,10:45,46:15,18.4,John Smith +Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald +Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht +Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre> +</div></div> +<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information +in TAB-delimited format:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Dive site Dive date Time Dive_duration Dive_depth Dive buddy +Illovo Beach 2012-11-23 10:45 46:15 18.4 John Smith +Key Largo 2012-11-24 09:12 34:15 20.4 Jason McDonald +Wismar Baltic 2012-12-01 10:13 35:27 15.4 Dieter Albrecht +Pulau Weh 2012-12-20 09:46 55:56 38.6 Karaeng Bontonompo</code></pre> +</div></div> +<div class="paragraph"><p>It is clear why many people prefer the TAB-delimited format to the +comma-delimited format. The disadvantage is that one cannot see the TAB +characters. For instance, the space between <em>Dive</em> and <em>date</em> in the top +line may be a SPACE character or a TAB character (in this case it is a SPACE +character: the tabs are before and after <em>Dive date</em>). If the field names in +the first line are long, the alignment with data in the other lines cannot +be maintained. Here is a highly simplified and shortened TAB-delimited +example of a <em>CSV</em> dive log from an APD closed-circuit rebreather (CCR) dive +computer:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Dive Time (s) Depth (m) pO₂ - Setpoint (Bar) pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius) +0 0.0 0.70 0.81 13.1 +0 1.2 0.70 0.71 13.1 +0 0.0 0.70 0.71 13.1 +0 1.2 0.70 0.71 13.2 +0 1.2 0.70 0.71 13.1 +10 1.6 0.70 0.72 12.7 +20 1.6 0.70 0.71 12.6 +30 1.7 0.70 0.71 12.6 +40 1.8 0.70 0.68 12.5</code></pre> </div></div> <div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column headers as well as some of the data in the first few lines of the <em>CSV</em> @@ -1890,13 +1890,13 @@ file might cause problems. Importing 100 dives at a time (<em>CSV dive details</em>) works, but larger files might exceed the limits of the parser used. When encountering problems with <em>CSV</em> imports, first try with a smaller file to make sure everything works.</td> -</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
+</tr></table> +</div> +</div> +</div> +</div> +<div class="sect2"> +<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3> <div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> or <a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates for the diving @@ -1907,7 +1907,7 @@ To do this:</p></div> <div class="sect3"> <h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4> <div class="ulist"><ul> -<li>
+<li> <p> Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a>. A confirmation email with instructions and a personal <strong>DIVERID</strong> @@ -1915,19 +1915,19 @@ Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion Companion App capabilities. </p> </li> -<li>
-<p>
-Download the app from
- <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play
- Store</a> or from
- <a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface">F-Droid</a>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect3">
-<h4 id="_using_the_subsurface_companion_app_on_an_android_smartphone">5.4.2. Using the Subsurface companion app on an Android smartphone</h4>
-<div class="paragraph"><p>On first use the app has three options:</p></div>
+<li> +<p> +Download the app from + <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play + Store</a> or from + <a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface">F-Droid</a>. +</p> +</li> +</ul></div> +</div> +<div class="sect3"> +<h4 id="_using_the_subsurface_companion_app_on_an_android_smartphone">5.4.2. Using the Subsurface companion app on an Android smartphone</h4> +<div class="paragraph"><p>On first use the app has three options:</p></div> <div class="ulist"><ul> <li> <p> @@ -1951,10 +1951,10 @@ Download the app from <em>Disconnect</em> menu option (see below). </p> </li> -</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+</ul></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> <td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on @@ -1973,9 +1973,9 @@ with 3 options:</p></div> <div class="ulist"><ul> <li> <p> -Current: A prompt for a place name (or a request to activate the GPS if it
- is turned off) will be displayed, after which the current location is saved.
-</p>
+Current: A prompt for a place name (or a request to activate the GPS if it + is turned off) will be displayed, after which the current location is saved. +</p> </li> <li> <p> @@ -1990,13 +1990,13 @@ Use Map: This option lets you fix a position by searching a world map. A </p> </li> </ul></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" /> +</div> +</div> +<div class="ulist"><ul> +<li> <p> Import local GPX file: The android device searches for .gpx files and located archives will be shown. The selected .gpx file is opened and the @@ -2006,8 +2006,8 @@ Import local GPX file: The android device searches for .gpx files and </p> </li> </ul></div> -</div>
-<div class="sect4">
+</div> +<div class="sect4"> <h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5> <div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the @@ -2031,9 +2031,9 @@ the dive description or other details may be changed.</p></div> it, date/time and GPS coordinates will be shown, with two options at the top of the screen:</p></div> <div class="ulist"><ul> -<li>
-<p>
-Edit (pencil): Change the text name or other characteristics of the dive
+<li> +<p> +Edit (pencil): Change the text name or other characteristics of the dive location. </p> </li> @@ -2048,7 +2048,7 @@ below.</p></div> simply selecting the locations (See <strong>A</strong> below) and then touching the right arrow at the top right of the screen.</p></div> <div class="admonitionblock"> -<table><tr>
+<table><tr> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> @@ -2057,26 +2057,26 @@ deletes the selected dive location(s).</td> </tr></table> </div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />
-</div>
-</div>
-<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to
-be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
-<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above
-(<strong>B</strong>).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_server_and_account">Server and account</h5>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
-</p>
-</li>
+<div class="content"> +<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" /> +</div> +</div> +<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to +be downloaded to a <em>Subsurface</em> dive log (see below).</p></div> +</div> +<div class="sect4"> +<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5> +<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above +(<strong>B</strong>).</p></div> +</div> +<div class="sect4"> +<h5 id="_server_and_account">Server and account</h5> +<div class="ulist"><ul> +<li> +<p> +<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>) +</p> +</li> <li> <p> <em>User ID.</em> The DIVERID obtained by registering as described above. The @@ -2092,12 +2092,12 @@ be downloaded to a <em>Subsurface</em> dive log (see below).</p></div> </p> </li> <li> -<p>
-<em>Upload new dives.</em> If selected, each time the user adds a dive location it
- is automatically sent to the server.
-</p>
-</li>
-</ul></div>
+<p> +<em>Upload new dives.</em> If selected, each time the user adds a dive location it + is automatically sent to the server. +</p> +</li> +</ul></div> </div> <div class="sect4"> <h5 id="_background_service">Background service</h5> @@ -2108,23 +2108,23 @@ collection of GPS locations.</p></div> <div class="ulist"><ul> <li> <p> -<em>Min duration.</em> In minutes. The app will try to get a location every X
- minutes until stopped by the user.
-</p>
-</li>
-<li>
-<p>
-<em>Min distance.</em> In meters. Minimum distance between two locations.
-</p>
-</li>
-<li>
-<p>
-<em>Name template.</em> The name the app will use when saving the locations.
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
+<em>Min duration.</em> In minutes. The app will try to get a location every X + minutes until stopped by the user. +</p> +</li> +<li> +<p> +<em>Min distance.</em> In meters. Minimum distance between two locations. +</p> +</li> +<li> +<p> +<em>Name template.</em> The name the app will use when saving the locations. +</p> +</li> +</ul></div> +<div class="admonitionblock"> +<table><tr> <td class="icon"> <img src="images/icons/info.jpg" alt="Tip" /> </td> @@ -2139,26 +2139,26 @@ location every 50 meters.</td> </tr></table> </div> </div> -<div class="sect4">
-<h5 id="_other">Other</h5>
-<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to
-the Subsurface mailing list.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Subsurface website.</em> A link to the URL of Subsurface web
-</p>
-</li>
-<li>
-<p>
-<em>Version.</em> Displays the current version of the Companion App.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_search">Search</h5>
-<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
+<div class="sect4"> +<h5 id="_other">Other</h5> +<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to +the Subsurface mailing list.</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Subsurface website.</em> A link to the URL of Subsurface web +</p> +</li> +<li> +<p> +<em>Version.</em> Displays the current version of the Companion App. +</p> +</li> +</ul></div> +</div> +<div class="sect4"> +<h5 id="_search">Search</h5> +<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div> </div> <div class="sect4"> <h5 id="_start_service">Start service</h5> @@ -2174,8 +2174,8 @@ used to download the dive locations of another registered diver.</p></div> </div> <div class="sect4"> <h5 id="_send_all_locations">Send all locations</h5> -<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
-</div>
+<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div> +</div> </div> <div class="sect3"> <h4 id="S_iphone">5.4.3. Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h4> @@ -2186,7 +2186,7 @@ information.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" /> -</div>
+</div> </div> <div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive location or waypoint is added to the GPS input stream. In automatic mode, a @@ -2204,8 +2204,8 @@ service. There isn’t an option to trigger upload manually.</p></div> </div> <div class="sect3"> <h4 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">5.4.4. Downloading dive locations to the <em>Subsurface</em> divelog</h4> -<div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into
-<em>Subsurface</em> before obtaining the GPS coordinates from the server. The
+<div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into +<em>Subsurface</em> before obtaining the GPS coordinates from the server. The download dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main Menu <em>Import → Import GPS data from Subsurface Service</em>, resulting in the image on the left (<strong>A</strong>), below. On first use the DIVERID text box is @@ -2241,11 +2241,11 @@ then to change the date-time back again <strong>after</strong> downloading GPS d <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/info.jpg" alt="Note" />
-</td>
-<td class="content">TIPS:</td>
-</tr></table>
-</div>
+<img src="images/icons/info.jpg" alt="Note" /> +</td> +<td class="content">TIPS:</td> +</tr></table> +</div> <div class="ulist"><ul> <li> <p> @@ -2261,16 +2261,16 @@ then to change the date-time back again <strong>after</strong> downloading GPS d </p> </li> <li> -<p>
-It may also make sense to give informative names to the locations sent to
- the web server, or at least to use an informative name in the <em>Name
- Template</em> setting while running the <em>background service</em>, especially on a
- dive trip with many dives and dive locations.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
+<p> +It may also make sense to give informative names to the locations sent to + the web server, or at least to use an informative name in the <em>Name + Template</em> setting while running the <em>background service</em>, especially on a + dive trip with many dives and dive locations. +</p> +</li> +</ul></div> +</div> +</div> <div class="sect2"> <h3 id="S_LoadImage">5.5. Adding photographs to dives</h3> <div class="paragraph"><p>Many (if not most) divers take a camera with them and take photographs @@ -2282,15 +2282,15 @@ profile, from where they can be viewed.</p></div> <div class="paragraph"><p>Left-lick on a dive or on a group of dives on the dive list. Then right-click on this dive or group of dives and choose the option <em>Load Images</em>:</p></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LoadImage1_f20.jpg" alt="FIGURE: Load images option" />
-</div>
-</div>
-<div class="paragraph"><p>The system file browser appears. Select the folder and photographs that need
-to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/LoadImage1_f20.jpg" alt="FIGURE: Load images option" /> +</div> +</div> +<div class="paragraph"><p>The system file browser appears. Select the folder and photographs that need +to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" /> </div> </div> @@ -2348,20 +2348,20 @@ profile.</p></div> Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the date-time. </p> -</li>
-</ul></div>
-<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the
-dive, it is not placed on the dive profile.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-the <em>Photos</em> tab of the <strong>Notes</strong> panel.
-</p>
-</li>
+</li> +</ul></div> +<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the +dive, it is not placed on the dive profile.</p></div> +</div> +<div class="sect3"> +<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4> +<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div> +<div class="ulist"><ul> +<li> +<p> +the <em>Photos</em> tab of the <strong>Notes</strong> panel. +</p> +</li> <li> <p> as tiny icons (stubs) on the dive profile at the appropriate positions @@ -2371,14 +2371,14 @@ as tiny icons (stubs) on the dive profile at the appropriate positions </p> </li> </ul></div> -<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
-</div>
-</div>
-<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+<div class="imageblock" style="text-align:left;"> +<div class="content"> +<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" /> +</div> +</div> +<div class="paragraph"><p>This results in a profile display as in the image below:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" /> </div> </div> @@ -2398,12 +2398,12 @@ also be deleted using the <em>Photos</em> tab (see text below).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" /> -</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
+</div> +</div> +</div> +<div class="sect3"> +<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4> +<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive (therefore sometimes with large overlap on the dive profile) can easily be accessed in the <em>Photos</em> tab. This tab serves as a tool for individually @@ -2461,11 +2461,11 @@ if there is a match between a calculated fingerprint and the one originally which the NEW directory of the photos needs to be specified. Select the appropriate directory and click the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div> -<div class="sidebarblock" id="Image_fingerprint_upgrade">
-<div class="content">
-<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
-<div class="admonitionblock">
-<table><tr>
+<div class="sidebarblock" id="Image_fingerprint_upgrade"> +<div class="content"> +<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div> +<div class="admonitionblock"> +<table><tr> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> @@ -2483,8 +2483,8 @@ fingerprints associated with a single dive if: </div></div> </div> </div> -<div class="sect2">
-<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
+<div class="sect2"> +<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3> <div class="sect3"> <h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4> <div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one @@ -2509,16 +2509,16 @@ only two types of information that need to be provided:</p></div> by pressing specific buttons). If the dive computer does not provide the information, the diver has to record these changes using a different method, e.g. writing it on a slate. </p> -</li>
-<li>
-<p>
-<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
- was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
- in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After
- right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
- those defined during the first step, above (see image below). If the
- <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the
- tank bar.
+</li> +<li> +<p> +<strong>Record the cylinder changes on the dive profile</strong>: If the latter option + was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point + in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After + right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from + those defined during the first step, above (see image below). If the + <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the + tank bar. </p> </li> </ul></div> @@ -2528,10 +2528,10 @@ with EAN28, then changing cylinders to EAN50 after 26 minutes for decompression.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
-</div>
-</div>
-</div>
+<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" /> +</div> +</div> +</div> <div class="sect3"> <h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4> <div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with @@ -2552,13 +2552,13 @@ involves three steps, exactly as with multi-cylinder dives above:</p></div> from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives. </p> </li> -<li>
-<p>
-<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
- specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see
- image below where two 12 litre cylinder were used).
-</p>
-</li>
+<li> +<p> +<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the + specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see + image below where two 12 litre cylinder were used). +</p> +</li> <li> <p> <strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported @@ -2572,20 +2572,20 @@ involves three steps, exactly as with multi-cylinder dives above:</p></div> the cylinder change events have been recorded on the dive profile, the correct cylinder pressures for both cylinders are shown on the dive profile, as in the image below. </p> -</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />
-</div>
-</div>
-<div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a dive
-logging tool.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
+</li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" /> +</div> +</div> +<div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a dive +logging tool.</p></div> +</div> +<div class="sect3"> +<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4> +<div class="admonitionblock"> +<table><tr> <td class="icon"> <img src="images/halcyon_RB80.jpg" alt="Note" /> </td> @@ -2606,16 +2606,16 @@ continuously from the back cylinder.</td> outlined above:</p></div> <div class="ulist"><ul> <li> -<p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
-</p>
-</li>
-<li>
-<p>
-pSCR diving often involves gas changes, requiring an additional cylinder.
- Define all the appropriate cylinders as described above and indicate the
- cylinder/gas changes as described above in the section on
- <a href="#S_MulticylinderDives">multicylinder dives</a>.
+<p> +Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel. +</p> +</li> +<li> +<p> +pSCR diving often involves gas changes, requiring an additional cylinder. + Define all the appropriate cylinders as described above and indicate the + cylinder/gas changes as described above in the section on + <a href="#S_MulticylinderDives">multicylinder dives</a>. </p> </li> </ul></div> @@ -2624,17 +2624,17 @@ adjusted for the oxygen drop across the mouthpiece, which often requires longer decompression periods. Below is a dive profile of a pSCR dive using EAN36 on the back cylinder and oxygen for decompression. Note that this dive lasted over two hours.</p></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" /> +</div> +</div> +</div> +<div class="sect3"> +<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/APD.jpg" alt="Note" /> </td> <td class="content">Closed system rebreathers use advanced technology to recirculate gas that @@ -2644,8 +2644,8 @@ a) remove carbon dioxide from the exhaled gas regulate the oxygen concentration to remain within safe diving limits. The CCR interface of <em>Subsurface</em> is currently experimental and under active development. Subsurface currently supports Poseidon MkVI and APD -Discovery/Evolution dive computers. In contrast to a conventional
-recreational dive computer, a CCR system computer does not allow the
+Discovery/Evolution dive computers. In contrast to a conventional +recreational dive computer, a CCR system computer does not allow the download of a log containing multiple dives. Rather, each dive is stored independently. This means that <em>Subsurface</em> cannot download a dive log directly from a CCR dive computer, but that it imports CCR dive logs in the @@ -2654,10 +2654,10 @@ a time.</td> </tr></table> </div> <div class="sect4"> -<h5 id="_import_a_ccr_dive">Import a CCR dive</h5>
-<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive
-information from other digital sources</a>. From the main menu of <em>Subsurface</em>,
-select <em>Import → Import log files</em> to bring up the
+<h5 id="_import_a_ccr_dive">Import a CCR dive</h5> +<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive +information from other digital sources</a>. From the main menu of <em>Subsurface</em>, +select <em>Import → Import log files</em> to bring up the <a href="#Unified_import">universal import dialogue</a>. As explained in that section, the bottom right hand of the import dialogue contains a dropdown list (labled <em>Filter:</em>) of appropriate devices that currently @@ -2672,22 +2672,22 @@ list.</p></div> </div> <div class="sect4"> <h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5> -<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the
-information from the oxygen sensors of the CCR equipment. In contrast to
-recreational equipment (where pO<sub>2</sub> values are calculated based on gas
-composition and dive depth), CCR equipment provide actual measurements of
-pO<sub>2</sub>, derived from oxygen sensors. In this case the graph for oxygen
-partial pressure should be fairly flat, reflecting the setpoint settings
-during the dive. The mean pO<sub>2</sub> is NOT the mean oxygen partial pressure as
-given by the CCR equipment, but a value calculated by <em>Subsurface</em> as
-follows:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.
-</p>
-</li>
-<li>
+<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the +information from the oxygen sensors of the CCR equipment. In contrast to +recreational equipment (where pO<sub>2</sub> values are calculated based on gas +composition and dive depth), CCR equipment provide actual measurements of +pO<sub>2</sub>, derived from oxygen sensors. In this case the graph for oxygen +partial pressure should be fairly flat, reflecting the setpoint settings +during the dive. The mean pO<sub>2</sub> is NOT the mean oxygen partial pressure as +given by the CCR equipment, but a value calculated by <em>Subsurface</em> as +follows:</p></div> +<div class="ulist"><ul> +<li> +<p> +For TWO O<sub>2</sub> sensors the mean value of the two sensors are given. +</p> +</li> +<li> <p> For THREE-sensor systems (e.g. APD), the mean value is also used. However differences of more than 0,1 bar in the simultaneous readings of different @@ -2696,12 +2696,12 @@ For THREE-sensor systems (e.g. APD), the mean value is also used. However </p> </li> <li> -<p>
-If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to
- the setpoint.
-</p>
-</li>
-</ul></div>
+<p> +If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to + the setpoint. +</p> +</li> +</ul></div> <div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div> <div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual oxygen sensors can be shown. The display of additional CCR information is @@ -2724,46 +2724,46 @@ pressure and the setpoint values, as shown below.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" /> -</div>
-</div>
-<div class="paragraph"><p>The second checkbox allows the display of the data from each individual
-oxygen sensor of the CCR equipment. The data for each sensor is colour-coded
-as follows:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Sensor 1: grey
-</p>
-</li>
-<li>
-<p>
-Sensor 2: blue
-</p>
-</li>
-<li>
-<p>
-Sensor 3: brown
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The mean oxygen pO<sub>2</sub> is indicated by the green line. This allows the direct
-comparison of data from each of the oxygen sensors, useful for detecting
-abnormally low or erratic readings from a particular sensor.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_sensor_data_f20.jpg" alt="FIGURE: CCR sensor data graph" />
-</div>
-</div>
-<div class="paragraph"><p>The setpoint data can be overlaid on the oxygen sensor data by activating
-both of the above check boxes. Partial pressures for nitrogen (and helium,
-if applicable) are shown in the usual way as for open circuit dives.</p></div>
-<div class="paragraph"><p><em>Events</em>: Several events are logged, e.g. switching the mouthpiece to open
-circuit. These events are indicated by yellow triangles and, if one hovers
-over a triangle, a description of that event is given as the bottom line in
-the <a href="#S_InfoBox">Information Box</a>.</p></div>
-<div class="paragraph"><p><em>Cylinder pressures</em>: Some CCR dive computers like the Poseidon MkVI record
-the pressures of the oxygen and diluent cylinders. The pressures of these
-two cylinders are shown as green lines overlapping the depth profile. In
+</div> +</div> +<div class="paragraph"><p>The second checkbox allows the display of the data from each individual +oxygen sensor of the CCR equipment. The data for each sensor is colour-coded +as follows:</p></div> +<div class="ulist"><ul> +<li> +<p> +Sensor 1: grey +</p> +</li> +<li> +<p> +Sensor 2: blue +</p> +</li> +<li> +<p> +Sensor 3: brown +</p> +</li> +</ul></div> +<div class="paragraph"><p>The mean oxygen pO<sub>2</sub> is indicated by the green line. This allows the direct +comparison of data from each of the oxygen sensors, useful for detecting +abnormally low or erratic readings from a particular sensor.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/CCR_sensor_data_f20.jpg" alt="FIGURE: CCR sensor data graph" /> +</div> +</div> +<div class="paragraph"><p>The setpoint data can be overlaid on the oxygen sensor data by activating +both of the above check boxes. Partial pressures for nitrogen (and helium, +if applicable) are shown in the usual way as for open circuit dives.</p></div> +<div class="paragraph"><p><em>Events</em>: Several events are logged, e.g. switching the mouthpiece to open +circuit. These events are indicated by yellow triangles and, if one hovers +over a triangle, a description of that event is given as the bottom line in +the <a href="#S_InfoBox">Information Box</a>.</p></div> +<div class="paragraph"><p><em>Cylinder pressures</em>: Some CCR dive computers like the Poseidon MkVI record +the pressures of the oxygen and diluent cylinders. The pressures of these +two cylinders are shown as green lines overlapping the depth profile. In addition, start and end pressures for both oxygen and diluent cylinders are shown in the <em>Equipment Tab</em>. Below is a dive profile for a CCR dive, including an overlay of setpoint and oxygen sensor data, as well as the @@ -2772,20 +2772,20 @@ the two oxygen sensors.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/CCR_dive_profile_f22.jpg" alt="FIGURE: CCR dive profile" /> -</div>
-</div>
-<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
-<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
-include setup information or metadata about the dive.</p></div>
-<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the
-precise pressure of nitrogen in the loop can usually not be determined from
-the dive log imported from the CCR equipment. Many CCR dive computers,
-however, report an internally-calculated deco ceiling that is reported in
-the dive log, reflecting a more accurate assessment. The display of this
-ceiling is activated by clicking the appropriate button to the left of the
-dive profile:</p></div>
-<div class="imageblock">
-<div class="content">
+</div> +</div> +<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by +<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may +include setup information or metadata about the dive.</p></div> +<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the +precise pressure of nitrogen in the loop can usually not be determined from +the dive log imported from the CCR equipment. Many CCR dive computers, +however, report an internally-calculated deco ceiling that is reported in +the dive log, reflecting a more accurate assessment. The display of this +ceiling is activated by clicking the appropriate button to the left of the +dive profile:</p></div> +<div class="imageblock"> +<div class="content"> <img src="images/icons/cceiling.jpg" alt="DC ceiling icon" /> </div> </div> @@ -2795,57 +2795,57 @@ Preferences → Graph</em>. Below is a dive profile indicating the dive computer-generated deco ceiling:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
-</div>
-</div>
-<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in
-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
-B</a>.</p></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
-<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has
-been selected in the <strong>Dive List</strong>. Useful information here includes the
-surface interval before the dive, the maximum and mean depths of the dive,
-the gas volume consumed, the surface air consumption (SAC) and the number of
-oxygen toxicity units (OTU) incurred.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Note" />
-</td>
-<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
-consumption taking in account gas incompressibility, particularly at tank
-pressures above 200 bar, making them more accurate. Users should refer to
-<a href="#SAC_CALCULATION">Appendix F</a> for more information.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3>
-<div class="paragraph"><p>When using a dive computer, it often reports several data items that cannot
-easily be presented in a standardised way because the nature of the
-information differs from one dive computer to another. These data often
-comprise setup information, metadata about a dive, battery levels, no fly
-times, or gradient factors used during the dive. When possible, this
-information is presented in the <strong>Extra Data</strong> tab. Below is an image showing
-extra data for a dive using a Poseidon rebreather.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3>
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" /> +</div> +</div> +<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for +Poseidon MkVI and APD equipment can be found in +<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix +B</a>.</p></div> +</div> +</div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3> +<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has +been selected in the <strong>Dive List</strong>. Useful information here includes the +surface interval before the dive, the maximum and mean depths of the dive, +the gas volume consumed, the surface air consumption (SAC) and the number of +oxygen toxicity units (OTU) incurred.</p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/info.jpg" alt="Note" /> +</td> +<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas +consumption taking in account gas incompressibility, particularly at tank +pressures above 200 bar, making them more accurate. Users should refer to +<a href="#SAC_CALCULATION">Appendix F</a> for more information.</td> +</tr></table> +</div> +</div> +<div class="sect2"> +<h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3> +<div class="paragraph"><p>When using a dive computer, it often reports several data items that cannot +easily be presented in a standardised way because the nature of the +information differs from one dive computer to another. These data often +comprise setup information, metadata about a dive, battery levels, no fly +times, or gradient factors used during the dive. When possible, this +information is presented in the <strong>Extra Data</strong> tab. Below is an image showing +extra data for a dive using a Poseidon rebreather.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" /> +</div> +</div> +</div> +<div class="sect2"> +<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3> <div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that more than one dive has been selected in the <strong>Dive List</strong> using the standard Ctrl-click or Shift-click of the mouse. If only one dive has been selected, @@ -2854,13 +2854,13 @@ selected, the total amount of dive time in these dives, as well as the minimum, maximum and mean for the dive duration, water temperature and surface air consumption (SAC). It also shows the depth of the shallowest and deepest dives of those selected.</p></div> -</div>
-<div class="sect2">
-<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Profile2.jpg" alt="Typical dive profile" />
-</div>
+</div> +<div class="sect2"> +<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Profile2.jpg" alt="Typical dive profile" /> +</div> </div> <div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on @@ -2873,10 +2873,10 @@ is given using different colors:</p></div> <div class="tableblock"> <table rules="all" width="100%" -frame="border"
-cellspacing="0" cellpadding="4">
-<col width="33%" />
-<col width="33%" />
+frame="border" +cellspacing="0" cellpadding="4"> +<col width="33%" /> +<col width="33%" /> <col width="33%" /> <tbody> <tr> @@ -2889,9 +2889,9 @@ cellspacing="0" cellpadding="4"> <td align="left" valign="top"><p class="table">> 30</p></td> <td align="left" valign="top"><p class="table">> 18</p></td> </tr> -<tr>
-<td align="left" valign="top"><p class="table">Orange</p></td>
-<td align="left" valign="top"><p class="table">18 - 30</p></td>
+<tr> +<td align="left" valign="top"><p class="table">Orange</p></td> +<td align="left" valign="top"><p class="table">18 - 30</p></td> <td align="left" valign="top"><p class="table">9 - 18</p></td> </tr> <tr> @@ -2909,7 +2909,7 @@ cellspacing="0" cellpadding="4"> <td align="left" valign="top"><p class="table">< 1.5</p></td> <td align="left" valign="top"><p class="table">< 1.5</p></td> </tr> -</tbody>
+</tbody> </table> </div> <div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the @@ -2917,9 +2917,9 @@ graph. So users should see the depth of the deepest point and other peaks. Mean depth is plotted as a grey line, indicating mean dive depth up to a particular moment during the dive.</p></div> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/scale.jpg" alt="Note" />
+<table><tr> +<td class="icon"> +<img src="images/icons/scale.jpg" alt="Note" /> </td> <td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of @@ -2928,8 +2928,8 @@ the panel.</td> </tr></table> </div> <div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values -placed adjacent to significant changes.</p></div>
-<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>,
+placed adjacent to significant changes.</p></div> +<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer reported deco ceilings (only visible for deep, long, or repetitive dives). Partial pressures of oxygen are indicated in green, @@ -2945,18 +2945,18 @@ during the dive. This is shown below the dive depth and water temperature graphs.</td> </tr></table> </div> -<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/N2.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong>
-during the dive.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/N2.jpg" alt="Note" /> +</td> +<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong> +during the dive.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/He.jpg" alt="Note" /> </td> <td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong> @@ -2974,17 +2974,17 @@ relative to some absolute values but relative to the average normalized air consumption during the dive. So areas that are red or orange indicate times of increased normalized air consumption while dark green reflects times when the diver was using less gas than average.</p></div> -<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/Heartbutton.png" alt="Note" />
-</td>
-<td class="content">Clicking on the heart rate button will allow the display of heart rate
-information during the dive if the dive computer was attached to a heart
-rate sensor.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by using
+<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/Heartbutton.png" alt="Note" /> +</td> +<td class="content">Clicking on the heart rate button will allow the display of heart rate +information during the dive if the dive computer was attached to a heart +rate sensor.</td> +</tr></table> +</div> +<div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by using the scroll wheel / scroll gesture of your mouse or trackpad. By default <em>Subsurface</em> always shows a profile area large enough for at least 30 minutes and 30m @@ -2996,7 +2996,7 @@ something free divers won’t care about. <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/ruler.jpg" alt="Note" />
+<img src="images/icons/ruler.jpg" alt="Note" /> </td> <td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the <strong>ruler button</strong> on the left of the dive profile panel. The measurement is @@ -3006,9 +3006,9 @@ underneath the two red dots.</td> </tr></table> </div> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/ShowPhotos.png" alt="Note" />
+<table><tr> +<td class="icon"> +<img src="images/icons/ShowPhotos.png" alt="Note" /> </td> <td class="content">Photographs that have been added to a dive can be shown on the profile by selecting the <strong>Show-photo</strong> button. The position of a photo on the profile @@ -3043,51 +3043,51 @@ computers offer longer non-stop bottom times.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/cceiling.jpg" alt="Note" />
-</td>
-<td class="content">If the dive computer itself calculates a ceiling and makes it available to
-<em>Subsurface</em> during upload of dives, this can be shown as a red area by
-checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling1.jpg" alt="Note" />
-</td>
-<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a
-ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a
-particular dive (<strong>A</strong> in figure below). This setting can be modified in two
-ways:</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling2.jpg" alt="Note" />
-</td>
-<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is
-clicked, the ceiling is shown for the tissue compartments following the
-Bühlmann model (<strong>B</strong> in figure below).</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling3.jpg" alt="Note" />
-</td>
-<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked,
-then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td>
-</tr></table>
-</div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" />
-</div>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+<img src="images/icons/cceiling.jpg" alt="Note" /> +</td> +<td class="content">If the dive computer itself calculates a ceiling and makes it available to +<em>Subsurface</em> during upload of dives, this can be shown as a red area by +checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/ceiling1.jpg" alt="Note" /> +</td> +<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a +ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a +particular dive (<strong>A</strong> in figure below). This setting can be modified in two +ways:</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/ceiling2.jpg" alt="Note" /> +</td> +<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is +clicked, the ceiling is shown for the tissue compartments following the +Bühlmann model (<strong>B</strong> in figure below).</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/ceiling3.jpg" alt="Note" /> +</td> +<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked, +then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td> +</tr></table> +</div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" /> +</div> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/ShowCylindersButton.jpg" alt="Note" /> </td> <td class="content">By selecting this icon, the different cylinders used during a dive can be @@ -3099,18 +3099,18 @@ after 23 minutes. Cylinders with air are shown as a light blue bar.</td> </tr></table> </div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/ShowCylinders_f20.jpg" alt="Figure: Cylinder use graph" />
-</div>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/tissues.jpg" alt="Note" />
-</td>
-<td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure
-(horizontal grey line). Tissue pressures are calculated using the Bühlmann
-ZH-L16 algorithm and are displayed as lines ranging from green (faster
+<div class="content"> +<img src="images/ShowCylinders_f20.jpg" alt="Figure: Cylinder use graph" /> +</div> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/tissues.jpg" alt="Note" /> +</td> +<td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure +(horizontal grey line). Tissue pressures are calculated using the Bühlmann +ZH-L16 algorithm and are displayed as lines ranging from green (faster tissues) to blue (slower tissues). The black line, graphed above the ambient pressure, is the maximum allowable tissue supersaturation (pressure limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For @@ -3124,31 +3124,31 @@ moment in time, at the position of the cursor on the dive profile.</td> </tr></table> </div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />
-</div>
-</div>
-<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their
-depths. For more information about Gradient factors, see the section on
-<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently
-used gradient factors (e.g. GF 35/75) are shown above the depth profile if
-the appropriate toolbar buttons are activated. <strong>N.B.:</strong> The indicated
-gradient factors are NOT the gradient factors in use by the dive computer,
-but those used by <em>Subsurface</em> to calculate deco obligations during the
-dive. For more information external to this manual see:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
-</p>
-</li>
-</ul></div>
-</div>
+<div class="content"> +<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" /> +</div> +</div> +<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their +depths. For more information about Gradient factors, see the section on +<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently +used gradient factors (e.g. GF 35/75) are shown above the depth profile if +the appropriate toolbar buttons are activated. <strong>N.B.:</strong> The indicated +gradient factors are NOT the gradient factors in use by the dive computer, +but those used by <em>Subsurface</em> to calculate deco obligations during the +dive. For more information external to this manual see:</p></div> +<div class="ulist"><ul> +<li> +<p> +<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a> +</p> +</li> +<li> +<p> +<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a> +</p> +</li> +</ul></div> +</div> <div class="sect2"> <h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3> <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while @@ -3175,11 +3175,11 @@ profile. Normally the Information Box is located to the top left of the <strong>Dive Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong> panel, then only the top line of the Information Box is visible (see left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved -around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so
-that it is not obstructing important detail. The position of the Information
-Box is saved and used again during subsequent dive analyses.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so +that it is not obstructing important detail. The position of the Information +Box is saved and used again during subsequent dive analyses.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/InfoBox2.jpg" alt="Figure: Information Box" /> </div> </div> @@ -3203,11 +3203,11 @@ buttons on the left of the profile panel. These are:</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/MOD.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum
-Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is
-dependent on the oxygen concentration in the breathing gas. For air (21%
+<img src="images/icons/MOD.jpg" alt="Note" /> +</td> +<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum +Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is +dependent on the oxygen concentration in the breathing gas. For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the <strong>Preferences</strong> section (select <em>File</em> → Preferences → Graph_ and edit the text box <em>Max pO<sub>2</sub> when showing MOD</em>. Below the MOD there is a markedly @@ -3215,11 +3215,11 @@ increased risk of exposure to the dangers of oxygen toxicity.</td> </tr></table> </div> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/NDL.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display either the
+<table><tr> +<td class="icon"> +<img src="images/icons/NDL.jpg" alt="Note" /> +</td> +<td class="content">Clicking this button causes the Information Box to display either the <strong>No-deco Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time duration that a diver can continue with a dive, given the present depth, that does not require decompression (that is, before an ascent ceiling @@ -3234,8 +3234,8 @@ accurately calculated and Subsurface only indicates <em>TTS > 2h</em>.</td> </tr></table> </div> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
+<table><tr> +<td class="icon"> <img src="images/icons/SAC.jpg" alt="Note" /> </td> <td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air @@ -3249,9 +3249,9 @@ is liters/min or cubic ft/min.</td> </tr></table> </div> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/EAD.jpg" alt="Note" />
+<table><tr> +<td class="icon"> +<img src="images/icons/EAD.jpg" alt="Note" /> </td> <td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix @@ -3277,11 +3277,11 @@ dive</em>. It is shown by the position of the cursor on the <strong>Dive Profile drawing on the left below indicates the meaning of the different parts of the Gas Pressure Bar Graph.</p></div> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />
-</div>
-</div>
-<div class="ulist"><ul>
+<div class="content"> +<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" /> +</div> +</div> +<div class="ulist"><ul> <li> <p> The light green area indicates the total gas, with the top margin of the @@ -3289,34 +3289,34 @@ The light green area indicates the total gas, with the top margin of the measured from the bottom of the graph to the top of the light green area. This pressure has a <em>relative</em> value in the graph and does not indicate absolute pressure. -</p>
-</li>
-<li>
-<p>
-The horizontal black line underneath the light green margin indicates the
- equilibrium pressure of the inert gases inhaled by the diver, usually
- nitrogen. In the case of trimix, it is the pressures of nitrogen and helium
- combined. In this example, the user is diving with EAN32, so the inert gas
- pressure is 68% of the distance from the bottom of the graph to the total
- gas pressure value.
-</p>
-</li>
-<li>
-<p>
-The dark green area at the bottom of the graph represents the pressures of
- inert gas in each of the 16 tissue compartments, following the Bühlmann
- algorithm, the fast tissues being on the left hand side.
-</p>
-</li>
-<li>
-<p>
-The top black horizontal line indicates the gradient factor that applies to
- the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
- gradient factor shown is an interpolation between the GFLow and GFHigh
- values specified in the Graph tab of the <strong>Preferences Panel</strong> of
- <strong>Subsurface</strong>.
-</p>
-</li>
+</p> +</li> +<li> +<p> +The horizontal black line underneath the light green margin indicates the + equilibrium pressure of the inert gases inhaled by the diver, usually + nitrogen. In the case of trimix, it is the pressures of nitrogen and helium + combined. In this example, the user is diving with EAN32, so the inert gas + pressure is 68% of the distance from the bottom of the graph to the total + gas pressure value. +</p> +</li> +<li> +<p> +The dark green area at the bottom of the graph represents the pressures of + inert gas in each of the 16 tissue compartments, following the Bühlmann + algorithm, the fast tissues being on the left hand side. +</p> +</li> +<li> +<p> +The top black horizontal line indicates the gradient factor that applies to + the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The + gradient factor shown is an interpolation between the GFLow and GFHigh + values specified in the Graph tab of the <strong>Preferences Panel</strong> of + <strong>Subsurface</strong>. +</p> +</li> <li> <p> The bottom margin of the red area in the graph indicates the Bühlman-derived @@ -3344,13 +3344,13 @@ Graph <strong>B</strong> indicates the situation after a descent to 30 meters. F </p> </li> <li> -<p>
-Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast
- compartments have attained equilibrium (i.e. they have reached the hight of
- the black line indicating the equilibrium pressure). The slower compartments
- (towards the right) have not reached equilibrium and are in the process of
- slowly increasing in pressure.
-</p>
+<p> +Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast + compartments have attained equilibrium (i.e. they have reached the hight of + the black line indicating the equilibrium pressure). The slower compartments + (towards the right) have not reached equilibrium and are in the process of + slowly increasing in pressure. +</p> </li> <li> <p> @@ -3362,18 +3362,18 @@ Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 mete exceeding the gradient factor value (GFHigh), endangering the diver. </p> </li> -<li>
-<p>
-Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10
- minutes. The fast compartments have decreased in pressure. As expected, the
- pressures in the slow compartments have not changed much. The pressures in
- the fast compartments do not approach the GFHigh value any more and the
- diver is safer than in the situation indicated in graph <strong>D</strong>.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
+<li> +<p> +Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10 + minutes. The fast compartments have decreased in pressure. As expected, the + pressures in the slow compartments have not changed much. The pressures in + the fast compartments do not approach the GFHigh value any more and the + diver is safer than in the situation indicated in graph <strong>D</strong>. +</p> +</li> +</ul></div> +</div> +</div> </div> </div> <div class="sect1"> @@ -3395,10 +3395,10 @@ a single dive or a group of dives and then right-clicking.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" /> -</div>
-</div>
-<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive,
-Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This
+</div> +</div> +<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive, +Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the header bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header brings up a list of items that can be shown in the dive list (see @@ -3407,7 +3407,7 @@ above). Select an item to be shown in the <strong>Dive List</strong> or be delet updated. Preferences for information shown in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div> </div> -</div>
+</div> <div class="sect2"> <h3 id="S_Renumber">7.2. Renumbering the dives</h3> <div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low @@ -3467,9 +3467,9 @@ expanding all trips and collapsing all trips.</p></div> </div> <div class="sect3"> <h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4> -<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips
-by either merging the selected trip with the trip below or with the trip
-above. (Merge trip with trip below; Merge trip with trip above)</p></div>
+<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips +by either merging the selected trip with the trip below or with the trip +above. (Merge trip with trip below; Merge trip with trip above)</p></div> </div> <div class="sect3"> <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4> @@ -3482,12 +3482,12 @@ context menu on the left (A) and the completed action on the right (B):</p></div <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" /> -</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
+</div> +</div> +</div> +</div> +<div class="sect2"> +<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3> <div class="sect3"> <h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4> <div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and @@ -3506,9 +3506,9 @@ time of the unlinked dive.</p></div> </div> <div class="sect3"> <h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4> -<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed
-within a separate trip. To do this, select and right-click the dive(s) to
-bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
+<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed +within a separate trip. To do this, select and right-click the dive(s) to +bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div> </div> <div class="sect3"> <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4> @@ -3529,22 +3529,22 @@ List</strong> panel. You can merge these dives onto a single dive by selecting t appropriate dives, right-clicking them to bring up the context menu and then selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive information in the <strong>Notes</strong> panel to reflect events or conditions that apply -to the merged dive. The figure below shows the depth profile of two dives
-that were merged:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/MergedDive.png" alt="Example: Merged dive" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
-<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or
-redone. This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and
-<em>shift dive times</em>. To do this after performing any of these actions, from
-the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or
-<em>Redo</em> an action.</p></div>
-</div>
+to the merged dive. The figure below shows the depth profile of two dives +that were merged:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/MergedDive.png" alt="Example: Merged dive" /> +</div> +</div> +</div> +<div class="sect3"> +<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4> +<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or +redone. This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and +<em>shift dive times</em>. To do this after performing any of these actions, from +the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or +<em>Redo</em> an action.</p></div> +</div> </div> <div class="sect2"> <h3 id="S_Filter">7.5. Filtering the dive list</h3> @@ -3564,7 +3564,7 @@ it. The filter may also be reset and closed by selecting the *red button</strong with the white cross.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
+<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" /> </div> </div> <div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person @@ -3583,8 +3583,8 @@ therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy. But the within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows those dives that have either one OR both of these tags.</p></div> </div> -</div>
-</div>
+</div> +</div> <div class="sect1"> <h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2> <div class="sectionbody"> @@ -3592,15 +3592,15 @@ those dives that have either one OR both of these tags.</p></div> <div class="ulist"><ul> <li> <p> -Exporter les informations de plongée vers <em>Facebook</em>
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Export_other">Exporter des informations de plongée vers d’autres
- destinations ou formats</a>
-</p>
-</li>
+Exporter les informations de plongée vers <em>Facebook</em> +</p> +</li> +<li> +<p> +<a href="#S_Export_other">Exporter des informations de plongée vers d’autres + destinations ou formats</a> +</p> +</li> </ul></div> <div class="sect2"> <h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3> @@ -3642,11 +3642,11 @@ from a regular Facebook login either in a browser or a Facebook app.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" /> -</div>
-</div>
-<div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en
-sélectionnant _Fichier → Préférences → Facebook, à partir du menu
-principal et en cliquant sur le bouton approprié dans le panneau des
+</div> +</div> +<div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en +sélectionnant _Fichier → Préférences → Facebook, à partir du menu +principal et en cliquant sur le bouton approprié dans le panneau des préférences Facebook.</p></div> </div> <div class="sect2"> @@ -3655,26 +3655,26 @@ préférences Facebook.</p></div> <em>File → Export</em>, which brings up the Export dialog. This dialog always gives two options: save ALL dives, or save only the dives selected in <strong>Dive List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images -below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Export_f20.jpg" alt="Figure: Export dialog" />
-</div>
-</div>
-<div class="paragraph"><p>A dive log or part of it can be saved in three formats:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> for more
- information. UDDF is a generic format that enables communication among many
- dive computers and computer programs.
-</p>
-</li>
+below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Export_f20.jpg" alt="Figure: Export dialog" /> +</div> +</div> +<div class="paragraph"><p>A dive log or part of it can be saved in three formats:</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>. +</p> +</li> +<li> +<p> +Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> for more + information. UDDF is a generic format that enables communication among many + dive computers and computer programs. +</p> +</li> <li> <p> <em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to @@ -3691,27 +3691,27 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo </p> </li> <li> -<p>
-<em>CSV dive details</em>, that includes the most critical information of the dive
- profile. Included information of a dive is: dive number, date, time, buddy,
- duration, depth, temperature and pressure: in short, most of the information
- that recreational divers enter into handwritten log books.
-</p>
-</li>
-<li>
-<p>
-<em>CSV dive profile</em>, that includes a large amount of detail for each dive,
- including the depth profile, temperature and pressure information of each
- dive.
-</p>
-</li>
-<li>
-<p>
-<em>HTML</em> format, in which the dive(s) are stored in HTML files, readable with
- an Internet browser. Most modern web browsers are supported, but JavaScript
- must be enabled. The HTML export cannot be changed or edited. It contains
- most of the information recorded in the dive log. However, it does not show
- the calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder
+<p> +<em>CSV dive details</em>, that includes the most critical information of the dive + profile. Included information of a dive is: dive number, date, time, buddy, + duration, depth, temperature and pressure: in short, most of the information + that recreational divers enter into handwritten log books. +</p> +</li> +<li> +<p> +<em>CSV dive profile</em>, that includes a large amount of detail for each dive, + including the depth profile, temperature and pressure information of each + dive. +</p> +</li> +<li> +<p> +<em>HTML</em> format, in which the dive(s) are stored in HTML files, readable with + an Internet browser. Most modern web browsers are supported, but JavaScript + must be enabled. The HTML export cannot be changed or edited. It contains + most of the information recorded in the dive log. However, it does not show + the calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder pressure, gas pressures and MOD. The HTML export contains a search option to search the dive log. HTML export is specified on the second tab of the Export dialog (image <strong>B</strong> above). A typical use of this option is to export @@ -3729,14 +3729,14 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo in text, as shown in the image below. </p> </li> -</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/mapview_f20.jpg" alt="Figure: HTML Map export view" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
+</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/mapview_f20.jpg" alt="Figure: HTML Map export view" /> +</div> +</div> +<div class="ulist"><ul> +<li> <p> <em>Image depths</em>, which creates a text file that contains the file names of all photos or images attached to any of the selected dives in the <em>Dive @@ -3745,35 +3745,35 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo </p> </li> <li> -<p>
-<em>General Settings</em>, under the HTML tab, provides the following options:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Subsurface Numbers: if this option is checked, the dive(s) are exported with the
- numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered
- starting from 1.
-</p>
-</li>
-<li>
-<p>
-Export Yearly Statistics: if this option is checked, a yearly statistics table will
- be attached to the HTML exports.
-</p>
-</li>
-<li>
-<p>
-Export List only: a list of dives only (date, time, depth, duration) will be exported
- and the detailed dive information, e.g. dive profile, will not be available.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Under <em>Style Options</em> some style-related options are available like font
- size and theme.
+<p> +<em>General Settings</em>, under the HTML tab, provides the following options: +</p> +<div class="ulist"><ul> +<li> +<p> +Subsurface Numbers: if this option is checked, the dive(s) are exported with the + numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered + starting from 1. +</p> +</li> +<li> +<p> +Export Yearly Statistics: if this option is checked, a yearly statistics table will + be attached to the HTML exports. +</p> +</li> +<li> +<p> +Export List only: a list of dives only (date, time, depth, duration) will be exported + and the detailed dive information, e.g. dive profile, will not be available. +</p> +</li> +</ul></div> +</li> +<li> +<p> +Under <em>Style Options</em> some style-related options are available like font + size and theme. </p> </li> </ul></div> @@ -3781,8 +3781,8 @@ Under <em>Style Options</em> some style-related options are available like font instance <em>www.divelogs.de</em>.</p></div> </div> </div> -</div>
-<div class="sect1">
+</div> +<div class="sect1"> <h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2> <div class="sectionbody"> <div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a @@ -3801,51 +3801,51 @@ local hard disk. The only requirement is that you should first register as a user on the cloud. To use <em>Subsurface cloud storage</em> , follow these steps:</p></div> <div class="sect2"> -<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Open the <strong>Network Preferences</strong> by selecting <em>File</em> → <em>Preferences</em> → <em>Network</em>.
-</p>
-</li>
-<li>
-<p>
-In the section headed <em>Subsurface cloud storage</em>, enter an email address that
- <em>Subsurface</em> can use for user registration.
-</p>
-</li>
-<li>
-<p>
-Enter a novel password that <em>Subsurface</em> will use to store the
- dive log in the cloud.
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> to send the above email address and password to the
- (remote) cloud server. The server responds by sending a verification PIN to
- the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
- email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
- box, not visible previously.
-</p>
-</li>
-<li>
-<p>
-Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
-(this field is only visible while the server is waiting for email
-address confirmation)
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
-will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
+<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3> +<div class="ulist"><ul> +<li> +<p> +Open the <strong>Network Preferences</strong> by selecting <em>File</em> → <em>Preferences</em> → <em>Network</em>. +</p> +</li> +<li> +<p> +In the section headed <em>Subsurface cloud storage</em>, enter an email address that + <em>Subsurface</em> can use for user registration. +</p> +</li> +<li> +<p> +Enter a novel password that <em>Subsurface</em> will use to store the + dive log in the cloud. +</p> +</li> +<li> +<p> +Click <em>Apply</em> to send the above email address and password to the + (remote) cloud server. The server responds by sending a verification PIN to + the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the + email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text + box, not visible previously. +</p> +</li> +<li> +<p> +Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog +(this field is only visible while the server is waiting for email +address confirmation) +</p> +</li> +<li> +<p> +Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account +will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3> <div class="ulist"><ul> <li> <p> @@ -3871,8 +3871,8 @@ data with the cloud server the next time the program is used while the computer connected to the Internet. </p> </li> -</ul></div>
-</div>
+</ul></div> +</div> <div class="sect2"> <h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3> <div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that @@ -3919,8 +3919,8 @@ folder and select the <em>Open</em> button.</p></div> <div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the same process could be used for the Cloud-based storage of dive logs.</p></div> </div> -</div>
-</div>
+</div> +</div> <div class="sect1"> <h2 id="S_PrintDivelog">10. Printing a dive log</h2> <div class="sectionbody"> @@ -3948,31 +3948,31 @@ and page layout:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" /> -</div>
-</div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Under <em>Print type</em> select one of two options:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and
- other information.
-</p>
-</li>
-<li>
-<p>
-<em>Statistics print</em>: Print yearly statistics of the dives.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Under <em>Print options</em> select:
-</p>
+</div> +</div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +Under <em>Print type</em> select one of two options: +</p> +<div class="ulist"><ul> +<li> +<p> +<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and + other information. +</p> +</li> +<li> +<p> +<em>Statistics print</em>: Print yearly statistics of the dives. +</p> +</li> +</ul></div> +</li> +<li> +<p> +Under <em>Print options</em> select: +</p> <div class="ulist"><ul> <li> <p> @@ -3995,51 +3995,51 @@ several choices. (see image <strong>B</strong>, above).</p></div> <div class="ulist"><ul> <li> <p> -<em>Table</em>: This prints a summary table of all dives selected (see below).
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Flow layout</em>: Print the text associated with each dive without printing the
- dive profiles
- of each dive (see below):
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>One Dive</em>: Print one dive per page, also showing the dive profile (see
- below)
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
-</p>
-</li>
-<li>
-<p>
-<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
+<em>Table</em>: This prints a summary table of all dives selected (see below). +</p> +</li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" /> +</div> +</div> +<div class="ulist"><ul> +<li> +<p> +<em>Flow layout</em>: Print the text associated with each dive without printing the + dive profiles + of each dive (see below): +</p> +</li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" /> +</div> +</div> +<div class="ulist"><ul> +<li> +<p> +<em>One Dive</em>: Print one dive per page, also showing the dive profile (see + below) +</p> +</li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" /> +</div> +</div> +<div class="ulist"><ul> +<li> +<p> +<em>Two Dives</em>: Print two dives per page, also showing the dive profiles. +</p> +</li> +<li> +<p> +<em>Six Dives</em>: Print six dives per page, also showing the dive profiles. </p> </li> </ul></div> @@ -4054,17 +4054,17 @@ below):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" /> -</div>
-</div>
-<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
-the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the
-dives. Below is a (rather small) example of the output for one particular
-page.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
-</div>
-</div>
+</div> +</div> +<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing +the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the +dives. Below is a (rather small) example of the output for one particular +page.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" /> +</div> +</div> <div class="sect2"> <h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d’impression personnalisé (avancé)</h3> <div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized @@ -4072,10 +4072,10 @@ printouts. Subsurface uses HTML templates to render printing. You can create a template, export a new template, import an existing template and delete an existing template by using the appropriate buttons under the <em>Template</em> dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for -information on how to write or modify a template.</p></div>
-</div>
-</div>
-</div>
+information on how to write or modify a template.</p></div> +</div> +</div> +</div> <div class="sect1"> <h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2> <div class="sectionbody"> @@ -4091,10 +4091,10 @@ this.</p></div> <div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>, sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du menu principal. Fournir le nom du périphérique dans le champ en haut du -panneau de configuration et sélectionner le bon modèle d’ordinateur de
-plongée à partir du panneau à gauche (voir l’image ci-dessous).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+panneau de configuration et sélectionner le bon modèle d’ordinateur de +plongée à partir du panneau à gauche (voir l’image ci-dessous).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" /> </div> </div> @@ -4103,38 +4103,38 @@ actions can be done:</p></div> <div class="ulist"><ul> <li> <p> -<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l’ordinateur de plongée
- dans <em>Subsurface</em>, en l’affichant dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Enregistrer les modifications sur le périphérique</strong>. Cela change la configuration de l’ordinateur
- de plongée pour correspondre aux informations affichées dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande
- l’emplacement et le nom du fichier pour enregistrer les informations.
-</p>
-</li>
-<li>
-<p>
-<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d’un fichier de sauvegarde et l’affiche
- dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l’ordinateur de plongée,
- il sera chargé dans l’ordinateur de plongée.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect1">
+<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l’ordinateur de plongée + dans <em>Subsurface</em>, en l’affichant dans le panneau de configuration. +</p> +</li> +<li> +<p> +<strong>Enregistrer les modifications sur le périphérique</strong>. Cela change la configuration de l’ordinateur + de plongée pour correspondre aux informations affichées dans le panneau de configuration. +</p> +</li> +<li> +<p> +<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande + l’emplacement et le nom du fichier pour enregistrer les informations. +</p> +</li> +<li> +<p> +<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d’un fichier de sauvegarde et l’affiche + dans le panneau de configuration. +</p> +</li> +<li> +<p> +<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l’ordinateur de plongée, + il sera chargé dans l’ordinateur de plongée. +</p> +</li> +</ul></div> +</div> +</div> +<div class="sect1"> <h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2> <div class="sectionbody"> <div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by @@ -4148,11 +4148,11 @@ preferences are not saved.</p></div> <div class="sect2"> <h3 id="_defaults">12.1. Defaults</h3> <div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" />
-</div>
-</div>
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" /> +</div> +</div> <div class="ulist"><ul> <li> <p> @@ -4167,18 +4167,18 @@ preferences are not saved.</p></div> electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options: </p> -<div class="ulist"><ul>
-<li>
-<p>
-<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
-</p>
-</li>
-<li>
-<p>
-<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
- as described above.
-</p>
-</li>
+<div class="ulist"><ul> +<li> +<p> +<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup. +</p> +</li> +<li> +<p> +<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk + as described above. +</p> +</li> <li> <p> <em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud @@ -4186,44 +4186,44 @@ preferences are not saved.</p></div> </p> </li> </ul></div> -</li>
-<li>
-<p>
-<strong>Display invalid</strong>: Dives can be marked as invalid (when a user wishes to hide
- dives that he/she doesn’t consider valid dives, e.g. pool dives, but still want to
- keep them in the dive log). This controls whether those dives are displayed in
- the dive list.
-</p>
-</li>
-<li>
-<p>
-<strong>Default cylinder</strong>: Specify the default cylinder listed in
- the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
-</p>
-</li>
-<li>
-<p>
-<strong>Animations</strong>: Some actions in showing the dive profile are performed using
- animations. For instance, the axis values for depth and time change from dive to
- dive. When viewing a different dive, these changes in axis characteristics do not
- happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled
- by setting this slider
- with faster animation speed to the left, and a 0 value representing no animation
- at all.
-</p>
-</li>
-<li>
-<p>
-<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
- cleared and set to default values.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_units">12.2. Units</h3>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+</li> +<li> +<p> +<strong>Display invalid</strong>: Dives can be marked as invalid (when a user wishes to hide + dives that he/she doesn’t consider valid dives, e.g. pool dives, but still want to + keep them in the dive log). This controls whether those dives are displayed in + the dive list. +</p> +</li> +<li> +<p> +<strong>Default cylinder</strong>: Specify the default cylinder listed in + the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel. +</p> +</li> +<li> +<p> +<strong>Animations</strong>: Some actions in showing the dive profile are performed using + animations. For instance, the axis values for depth and time change from dive to + dive. When viewing a different dive, these changes in axis characteristics do not + happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled + by setting this slider + with faster animation speed to the left, and a 0 value representing no animation + at all. +</p> +</li> +<li> +<p> +<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are + cleared and set to default values. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_units">12.2. Units</h3> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" /> </div> </div> @@ -4237,12 +4237,12 @@ and others in imperial.</p></div> seconds or minutes. Choose the appropriate option. GPS coordinates can be represented either as traditional coordinates (degrees, minutes, seconds) or as decimal degrees Choose the appropriate option.</p></div> -</div>
-<div class="sect2">
-<h3 id="_graph">12.3. Graph</h3>
-<div class="imageblock" id="S_CCR_options" style="text-align:center;">
-<div class="content">
-<img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" />
+</div> +<div class="sect2"> +<h3 id="_graph">12.3. Graph</h3> +<div class="imageblock" id="S_CCR_options" style="text-align:center;"> +<div class="content"> +<img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" /> </div> </div> <div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div> @@ -4269,12 +4269,12 @@ was no gas switch to such a cylinder), then these cylinders are omitted from tha ascent.</p></div> <div class="ulist"><ul> <li> -<p>
-<strong>Misc</strong>:
-</p>
-<div class="ulist" id="GradientFactors_Ref"><ul>
-<li>
-<p>
+<p> +<strong>Misc</strong>: +</p> +<div class="ulist" id="GradientFactors_Ref"><ul> +<li> +<p> Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is the gradient factor at depth and GF_High is used just below the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. @@ -4283,22 +4283,22 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi the value of a gradient factor, the more conservative the calculations are with respect to nitrogen loading and the deeper the ascent ceilings are. Gradient factors of 20/60 are considered conservative and values of 70/90 are considered - harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
- deepest depth of a dive. If this box is not checked, GF_Low is applied at
- all depths deeper than the first deco stop. For more information see:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
-</p>
-</li>
-</ul></div>
+ harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the + deepest depth of a dive. If this box is not checked, GF_Low is applied at + all depths deeper than the first deco stop. For more information see: +</p> +<div class="ulist"><ul> +<li> +<p> +<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a> +</p> +</li> +<li> +<p> +<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a> +</p> +</li> +</ul></div> </li> <li> <p> @@ -4307,27 +4307,27 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>. </p> </li> -<li>
-<p>
-<em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub>
- values associated with each of the individual oxygen sensors of a CCR system.
- See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-<strong>Configuring dive planning using rebreather equipment:</strong>
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a
- CCR dive plan. This determines the pO<sub>2</sub> maintained
- during a particular dive. Setpoint changes during the dive can be added via the
- profile context menu.
-</p>
+<li> +<p> +<em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub> + values associated with each of the individual oxygen sensors of a CCR system. + See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>. +</p> +</li> +</ul></div> +</li> +<li> +<p> +<strong>Configuring dive planning using rebreather equipment:</strong> +</p> +<div class="ulist"><ul> +<li> +<p> +<em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a + CCR dive plan. This determines the pO<sub>2</sub> maintained + during a particular dive. Setpoint changes during the dive can be added via the + profile context menu. +</p> </li> <li> <p> @@ -4335,23 +4335,23 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning and decompression calculations. </p> -</li>
-<li>
-<p>
-<em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the
- environment to that of the gas recirculated to the diver. Set this value for a
- pSCR dive plan. A 1:10 ratio is commonly used.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_language">12.4. Language</h3>
-<div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+</li> +<li> +<p> +<em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the + environment to that of the gas recirculated to the diver. Set this value for a + pSCR dive plan. A 1:10 ratio is commonly used. +</p> +</li> +</ul></div> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_language">12.4. Language</h3> +<div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" /> </div> </div> @@ -4374,21 +4374,21 @@ Service Provider (ISP) used. Your ISP should provide the appropriate information.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
-</div>
-</div>
-<div class="paragraph"><p>This dialogue has three sections:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Proxy type</em>:
-If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,
-after which the IP address of the host and the appropriate port number should
-be provided. If the proxy server uses authentication, the appropriate userID and
-password are required so that <em>Subsurface</em> can automatically pass
-through the proxy server to access the Internet. This information is usually obtained
-from one’s ISP.
-</p>
+<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" /> +</div> +</div> +<div class="paragraph"><p>This dialogue has three sections:</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Proxy type</em>: +If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list, +after which the IP address of the host and the appropriate port number should +be provided. If the proxy server uses authentication, the appropriate userID and +password are required so that <em>Subsurface</em> can automatically pass +through the proxy server to access the Internet. This information is usually obtained +from one’s ISP. +</p> </li> <li> <p> @@ -4405,12 +4405,12 @@ from one’s ISP. </p> </li> <li> -<p>
-<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this
- information is saved in raw text form, not encoded in any way.
-</p>
-</li>
-</ul></div>
+<p> +<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this + information is saved in raw text form, not encoded in any way. +</p> +</li> +</ul></div> </li> <li> <p> @@ -4449,11 +4449,11 @@ below).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" /> -</div>
-</div>
-</div>
-</div>
-</div>
+</div> +</div> +</div> +</div> +</div> <div class="sect1"> <h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2> <div class="sectionbody"> @@ -4464,54 +4464,54 @@ of gradient factors as implemented by Erik Baker.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
-<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user
-is already familiar with the <em>Subsurface</em> user interface. It is explicitly
-used under the following conditions:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-The user is conversant with dive planning and has the necessary training to
- perform dive planning.
-</p>
-</li>
-<li>
-<p>
-The user plans dives within his/her certification limits.
-</p>
-</li>
-<li>
-<p>
-Dive planning makes large assumptions about the characteristics of the
- <em>average person</em> and cannot compensate for individual physiology or health
- or personal history or life style characteristics.
-</p>
-</li>
-<li>
-<p>
-The safety of a dive plan depends heavily on the way in which the planner is
- used.
-</p>
-</li>
-<li>
-<p>
-The user is familiar with the user interface of <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-A user who is not absolutely sure about any of the above requirements should
- not use this feature.
-</p>
-</li>
-</ul></div>
-</div></div>
-<div class="sect2">
+<table><tr> +<td class="icon"> +<img src="images/icons/warning2.png" alt="Warning" /> +</td> +<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user +is already familiar with the <em>Subsurface</em> user interface. It is explicitly +used under the following conditions:</td> +</tr></table> +</div> +<div class="ulist"><ul> +<li> +<p> +The user is conversant with dive planning and has the necessary training to + perform dive planning. +</p> +</li> +<li> +<p> +The user plans dives within his/her certification limits. +</p> +</li> +<li> +<p> +Dive planning makes large assumptions about the characteristics of the + <em>average person</em> and cannot compensate for individual physiology or health + or personal history or life style characteristics. +</p> +</li> +<li> +<p> +The safety of a dive plan depends heavily on the way in which the planner is + used. +</p> +</li> +<li> +<p> +The user is familiar with the user interface of <em>Subsurface</em>. +</p> +</li> +<li> +<p> +A user who is not absolutely sure about any of the above requirements should + not use this feature. +</p> +</li> +</ul></div> +</div></div> +<div class="sect2"> <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3> <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong> parameters for a dive are entered @@ -4522,17 +4522,17 @@ dive can be manipulated directly by dragging and clicking as explained below. This feature makes the <em>Subsurface</em> dive planner unique in ease of use.</p></div> <div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan -Details</em>. This is where the details of the dive plan are provided in a way
-that can easily be copied to other software. This is also where any warning
-messages about the dive plan are printed.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
+Details</em>. This is where the details of the dive plan are provided in a way +that can easily be copied to other software. This is also where any warning +messages about the dive plan are printed.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" /> +</div> +</div> +</div> +<div class="sect2"> +<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3> <div class="ulist"><ul> <li> <p> @@ -4540,27 +4540,27 @@ Towards the center bottom of the planner (circled in blue in the image above) is a dropbox with three options. Select the appropriate one of these: </p> <div class="ulist"><ul> -<li>
-<p>
-Open Circuit (the default)
-</p>
-</li>
-<li>
-<p>
-CCR
-</p>
-</li>
-<li>
-<p>
-pSCR
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Choose the Open Circuit option.
-</p>
+<li> +<p> +Open Circuit (the default) +</p> +</li> +<li> +<p> +CCR +</p> +</li> +<li> +<p> +pSCR +</p> +</li> +</ul></div> +</li> +<li> +<p> +Choose the Open Circuit option. +</p> </li> <li> <p> @@ -4571,24 +4571,24 @@ In the top left-hand area of the planning screen, be sure the constant dive assuming a sea-level atmospheric pressure of 1.013 bar. </p> </li> -<li>
-<p>
-In the table labelled <em>Available Gases</em>, add the information of the
- cylinders to be used as well as the gas composition within that
- cylinder. This is done in a similar way as for
- <a href="#cylinder_definitions">providing cylinder data for dive logs</a>. Choose the
- cylinder type by double clicking the cylinder type and using the dropdown
- list, then specify the work pressure of this cylinder. By leaving the oxygen
- concentration (O2%) filed empty, the cylinder is assumed to contain
- air. Otherwise enter the oxygen and/or helium concentration in the boxes
- provided in this dialogue. Add additional cylinders by using the "+" icon to
- the top right-hand of the dialogue.
-</p>
-</li>
-<li>
-<p>
-The profile of the planned dive can be created in two ways:
-</p>
+<li> +<p> +In the table labelled <em>Available Gases</em>, add the information of the + cylinders to be used as well as the gas composition within that + cylinder. This is done in a similar way as for + <a href="#cylinder_definitions">providing cylinder data for dive logs</a>. Choose the + cylinder type by double clicking the cylinder type and using the dropdown + list, then specify the work pressure of this cylinder. By leaving the oxygen + concentration (O2%) filed empty, the cylinder is assumed to contain + air. Otherwise enter the oxygen and/or helium concentration in the boxes + provided in this dialogue. Add additional cylinders by using the "+" icon to + the top right-hand of the dialogue. +</p> +</li> +<li> +<p> +The profile of the planned dive can be created in two ways: +</p> <div class="ulist"><ul> <li> <p> @@ -4600,20 +4600,20 @@ Drag the waypoints (the small white circles) on the existing dive profile to </p> </li> <li> -<p>
-The most efficient way to create a dive profile is to enter the appropriate
- values into the table marked <em>Dive planner points</em>. The first line of the
- table represents the duration and the final depth of the descent from the
- surface. Subsequent segments describe the bottom phase of the dive. The <em>CC
- set point</em> column is only relevant for closed circuit divers. The ascent is
- usually not specified because this is what the planner is supposed to
- calculate. Add additional segments to the profile by selecting the "+" icon
- at the top right hand of the table. Segments entered into the <em>Dive planner
- points</em> table automatically appear in the <strong>Dive Profile</strong> diagram.
-</p>
-</li>
-</ul></div>
-</li>
+<p> +The most efficient way to create a dive profile is to enter the appropriate + values into the table marked <em>Dive planner points</em>. The first line of the + table represents the duration and the final depth of the descent from the + surface. Subsequent segments describe the bottom phase of the dive. The <em>CC + set point</em> column is only relevant for closed circuit divers. The ascent is + usually not specified because this is what the planner is supposed to + calculate. Add additional segments to the profile by selecting the "+" icon + at the top right hand of the table. Segments entered into the <em>Dive planner + points</em> table automatically appear in the <strong>Dive Profile</strong> diagram. +</p> +</li> +</ul></div> +</li> </ul></div> <div class="sect3"> <h4 id="_recreational_dives">13.2.1. Recreational dives</h4> @@ -4637,17 +4637,17 @@ calculation of the nitrogen load incurred during previous dives.</p></div> <div class="ulist"><ul> <li> <p> -Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>
- and <em>Safety Stop</em>. Check these two boxes.
-</p>
-</li>
-<li>
-<p>
-Then define the cylinder size, the gas mixture (air or % oxygen) and the
- starting cylinder pressure in the top left-hand section of the planner under
- <em>Available gases</em>.
-</p>
-</li>
+Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em> + and <em>Safety Stop</em>. Check these two boxes. +</p> +</li> +<li> +<p> +Then define the cylinder size, the gas mixture (air or % oxygen) and the + starting cylinder pressure in the top left-hand section of the planner under + <em>Available gases</em>. +</p> +</li> <li> <p> The planner calculates whether the specified cylinder contains enough @@ -4655,7 +4655,7 @@ The planner calculates whether the specified cylinder contains enough under <em>Gas options</em>, specify an appropriate surface air consumption (SAC) rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min, with novice divers or difficult dives requiring SAC rates closer to 30l/min. -</p>
+</p> </li> <li> <p> @@ -4674,21 +4674,21 @@ Define the amount of gas the cylinder must have at the end of the bottom </p> </li> <li> -<p>
-Define the depth of the dive by dragging the waypoints (white dots) on the
- dive profile or (even better) defining the appropriate depths using the
- table under <em>Dive planner points</em> as desribed under the previous heading. If
- this is a multilevel dive, set the appropriate dive depths to represent the
- dive plan by adding waypoints to the dive profile or by adding appropriate
- dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will
- automatically extend the bottom section of the dive to the maximum duration
- within the no-decompression limits (NDL).
-</p>
-</li>
-<li>
-<p>
-The ascent speed can be changed. The default ascent speeds are those
- considered safe for recreational divers.
+<p> +Define the depth of the dive by dragging the waypoints (white dots) on the + dive profile or (even better) defining the appropriate depths using the + table under <em>Dive planner points</em> as desribed under the previous heading. If + this is a multilevel dive, set the appropriate dive depths to represent the + dive plan by adding waypoints to the dive profile or by adding appropriate + dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will + automatically extend the bottom section of the dive to the maximum duration + within the no-decompression limits (NDL). +</p> +</li> +<li> +<p> +The ascent speed can be changed. The default ascent speeds are those + considered safe for recreational divers. </p> </li> </ul></div> @@ -4698,9 +4698,9 @@ specified as described above. The <em>Subsurface</em> planner allows rapid assessment of dive duration as a function of dive depth, given the nitrogen load incurred during previous dives. The dive plan includes estimates of the amount of air/gas used, depending on the cylinder settings specified under -<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive
-duration shown is the true no-deco limit (NDL) without taking into account
-gas used during the dive. If the surface above the dive profile is RED it
+<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive +duration shown is the true no-deco limit (NDL) without taking into account +gas used during the dive. If the surface above the dive profile is RED it means that recreational dive limits are exceeded and either the dive duration or the dive depth needs to be reduced.</p></div> <div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 @@ -4711,9 +4711,9 @@ buddy-sharing during ascent.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" /> -</div>
-</div>
-</div>
+</div> +</div> +</div> <div class="sect3"> <h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4> <div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or @@ -4738,20 +4738,20 @@ models but only mathematical models that appear to work in practice.</p></div> <div class="paragraph"><p>For more information external to this manual see:</p></div> <div class="ulist"><ul> <li> -<p>
-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding
- M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
- factors for dummies, by Kevin Watts</a>
-<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco
-for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
-1-905492-07-3. Un excellent livre non technique qui traite à la fois des
-modèles de décompression Bühlmann et VPM-B.
-</p>
+<p> +<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding + M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a> +</p> +</li> +<li> +<p> +<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient + factors for dummies, by Kevin Watts</a> +<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco +for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: +1-905492-07-3. Un excellent livre non technique qui traite à la fois des +modèles de décompression Bühlmann et VPM-B. +</p> </li> </ul></div> <div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive @@ -4766,8 +4766,8 @@ setup.</p></div> <div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial pressure for oxygen needs to be specified for the bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>). -The most commonly
-used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
+The most commonly +used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the <em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div> @@ -4822,15 +4822,15 @@ change by right-clicking on the appropriate waypoint.</p></div> <div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner points indicates a valid setpoint for oxygen partial pressure and that the segment is dived using a closed circuit rebreather (CCR). If the last -manually entered segment is a CCR segment, the decompression phase is
-computed assuming the diver uses a CCR with the specified set-point. If the
-last segment (however short) is on open circuit (OC, indicated by a zero
-set-point) the decompression is computed in OC mode. The planner only
-considers gas changes in OC mode.</p></div>
-<div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent
-using EAN50 and using the settings as described above.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+manually entered segment is a CCR segment, the decompression phase is +computed assuming the diver uses a CCR with the specified set-point. If the +last segment (however short) is on open circuit (OC, indicated by a zero +set-point) the decompression is computed in OC mode. The planner only +considers gas changes in OC mode.</p></div> +<div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent +using EAN50 and using the settings as described above.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" /> </div> </div> @@ -4840,24 +4840,24 @@ the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div> <div class="paragraph"><p><strong>The dive plan details</strong></p></div> <div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the exact details of the dive plan are provided. These details may be modified -by checking any of the options under the <em>Notes</em> section of the dive
-planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim
-dive plan</em> is requested, a detailed sentence-level explanation of the dive
-plan is given. If any of the management specifications have been exceeded
-during the planning, a warning message is printed underneath the dive plan
-information.</p></div>
-<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of
-each depth level is indicated in the <em>Dive Plan Details</em>. This duration
-INCLUDES the transition time to get to that level. However, if the <em>Display
-transition in deco</em> option is checked, the transitions are shown separately
-from the segment durations at a particular level.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
-<em>Open circuit</em> in the dropdown list.
-The parameters of the pSCR dive can be set by selecting <em>File → Preferences → Graph</em>
+by checking any of the options under the <em>Notes</em> section of the dive +planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim +dive plan</em> is requested, a detailed sentence-level explanation of the dive +plan is given. If any of the management specifications have been exceeded +during the planning, a warning message is printed underneath the dive plan +information.</p></div> +<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of +each depth level is indicated in the <em>Dive Plan Details</em>. This duration +INCLUDES the transition time to get to that level. However, if the <em>Display +transition in deco</em> option is checked, the transitions are shown separately +from the segment durations at a particular level.</p></div> +</div> +</div> +<div class="sect2"> +<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3> +<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than +<em>Open circuit</em> in the dropdown list. +The parameters of the pSCR dive can be set by selecting <em>File → Preferences → Graph</em> from the main menu, where the gas consumption calculation takes into account the pSCR dump ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop accross the mouthpiece of the rebreather into account. If the @@ -4865,23 +4865,23 @@ pO<sub>2</sub> drops below what is considered safe, a warning appears in the <em details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints -are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
-to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
-the dropdown list, circled in blue in the image below.</p></div>
-<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
-diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
-cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Graph</em> from
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable +to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen +in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" /> +</div> +</div> +</div> +<div class="sect2"> +<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3> +<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in +the dropdown list, circled in blue in the image below.</p></div> +<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the +diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen +cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div> +<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table use the default setpoint value. Then, different setpoints can be specified for dive segments in the <em>Dive planner points</em> table. A zero setpoint @@ -4893,7 +4893,7 @@ this is calculated for bail out ascents.</p></div> <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />
+<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" /> </div> </div> <div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment @@ -4911,8 +4911,8 @@ saved as usual.</p></div> dive and adds a (possibly modified) copy to the dive list. If that copy is saved with the same start time as the original, the two dives are considered two versions of the same dive and do not influence other each during -decompression calculation (see next section).</p></div>
-</div>
+decompression calculation (see next section).</p></div> +</div> <div class="sect2"> <h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3> <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the @@ -4938,9 +4938,9 @@ Details</em> to include in a text file or word processing document.</p></div> <div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc). After a dive plan has been saved, the dive details and gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being -designed, it can be printed using the <em>Print</em> button in the dive
-planner. This prints the dive details and gas calculations in the <em>Dive Plan
-Details</em> panel of the dive planner. However, after the plan has been saved,
+designed, it can be printed using the <em>Print</em> button in the dive +planner. This prints the dive details and gas calculations in the <em>Dive Plan +Details</em> panel of the dive planner. However, after the plan has been saved, it is represented in a way very similar to a dive log and the gas calculations cannot be accessed in the same way as during the planning process. The only way to print the dive plan is to use the <em>File → Print</em> @@ -4948,21 +4948,21 @@ function on the main menu in the same way as for dive logs or by copy and paste to a word processor.</p></div> </div> </div> -</div>
-<div class="sect1">
-<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu
-principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers
-des sections de ce manuel traitant des opérations relatives.</p></div>
-<div class="sect2">
-<h3 id="_fichier">14.1. Fichier</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée
- actuellement ouvert et supprime toutes les informations de plongées.
-</p>
+</div> +<div class="sect1"> +<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2> +<div class="sectionbody"> +<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu +principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers +des sections de ce manuel traitant des opérations relatives.</p></div> +<div class="sect2"> +<h3 id="_fichier">14.1. Fichier</h3> +<div class="ulist"><ul> +<li> +<p> +<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée + actuellement ouvert et supprime toutes les informations de plongées. +</p> </li> <li> <p> @@ -4970,10 +4970,10 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<em>Open cloud storage</em> - Open the dive log previously saved in
- <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
-</p>
+<p> +<em>Open cloud storage</em> - Open the dive log previously saved in + <a href="#S_Cloud_storage"><em>Cloud storage</em></a>. +</p> </li> <li> <p> @@ -4981,15 +4981,15 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<em>Save to cloud storage</em> - Save the current dive log to
- <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
-</p>
-</li>
-<li>
-<p>
-<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.
-</p>
+<p> +<em>Save to cloud storage</em> - Save the current dive log to + <a href="#S_Cloud_storage"><em>Cloud storage</em></a>. +</p> +</li> +<li> +<p> +<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent. +</p> </li> <li> <p> @@ -4997,83 +4997,83 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
- ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
- formats.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement
- ouvert.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Preferences"><em>Préférences</em></a> - Définir les préférences de <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
- have been moved to
- a different disk or directory, locate them and link them to the appropriate
- dives.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Configure"><em>Configurer l’ordinateur de plongée</em></a> - Modifier la
- configuration d’un ordinateur de plongée.
-</p>
-</li>
-<li>
-<p>
-<em>Quitter</em> - Quitter <em>Subsurface</em>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_importer">14.2. Importer</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_ImportDiveComputer"><em>Importer depuis un l’ordinateur de plongée</em></a> -
- Importer des informations de plongées à partir de l’ordinateur de plongée.
-</p>
-</li>
-<li>
-<p>
-<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des
- informations de plongées à partir d’un fichier d’un format compatible avec
- <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> -
- Charge les coordonnées GPS à partir de l’application mobile <em>Subsurface</em>
- (téléphones et tablettes).
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des
- informations de plongées à partir de <em>www.Divelogs.de</em>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_journal_log">14.3. Journal (log)</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_EnterData"><em>Ajouter une plongée</em></a> - Ajouter manuellement une nouvelle
- plongée au panneau de la <strong>liste des plongées</strong>.
-</p>
+<p> +<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement + ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux + formats. +</p> +</li> +<li> +<p> +<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement + ouvert. +</p> +</li> +<li> +<p> +<a href="#S_Preferences"><em>Préférences</em></a> - Définir les préférences de <em>Subsurface</em>. +</p> +</li> +<li> +<p> +<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives + have been moved to + a different disk or directory, locate them and link them to the appropriate + dives. +</p> +</li> +<li> +<p> +<a href="#S_Configure"><em>Configurer l’ordinateur de plongée</em></a> - Modifier la + configuration d’un ordinateur de plongée. +</p> +</li> +<li> +<p> +<em>Quitter</em> - Quitter <em>Subsurface</em>. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_importer">14.2. Importer</h3> +<div class="ulist"><ul> +<li> +<p> +<a href="#S_ImportDiveComputer"><em>Importer depuis un l’ordinateur de plongée</em></a> - + Importer des informations de plongées à partir de l’ordinateur de plongée. +</p> +</li> +<li> +<p> +<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des + informations de plongées à partir d’un fichier d’un format compatible avec + <em>Subsurface</em>. +</p> +</li> +<li> +<p> +<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> - + Charge les coordonnées GPS à partir de l’application mobile <em>Subsurface</em> + (téléphones et tablettes). +</p> +</li> +<li> +<p> +<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des + informations de plongées à partir de <em>www.Divelogs.de</em>. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_journal_log">14.3. Journal (log)</h3> +<div class="ulist"><ul> +<li> +<p> +<a href="#S_EnterData"><em>Ajouter une plongée</em></a> - Ajouter manuellement une nouvelle + plongée au panneau de la <strong>liste des plongées</strong>. +</p> </li> <li> <p> @@ -5087,10 +5087,10 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
- plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
-</p>
+<p> +<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une + plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>. +</p> </li> <li> <p> @@ -5100,24 +5100,24 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<em>Coller les composants de la plongée</em> - Colle, dans les plongées
- sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au
- préalable avec l’option <em>Copier les composants de la plongée</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans
- le panneau de la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de
- <strong>liste des plongées</strong> dans des voyages de plongées.
-</p>
-</li>
+<p> +<em>Coller les composants de la plongée</em> - Colle, dans les plongées + sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au + préalable avec l’option <em>Copier les composants de la plongée</em>. +</p> +</li> +<li> +<p> +<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans + le panneau de la <strong>liste des plongées</strong>. +</p> +</li> +<li> +<p> +<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de + <strong>liste des plongées</strong> dans des voyages de plongées. +</p> +</li> <li> <p> <a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier @@ -5125,50 +5125,50 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement
- certaines plongées, à partir de tags ou de critères de plongées.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_vue">14.4. Vue</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de
- <em>Subsurface</em> simultanément.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la
- <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la
- plongée</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte
- mondiale</strong>.
-</p>
-</li>
-<li>
-<p>
-<em>Statistiques annuelles</em> - Affiche par année le résumé des statistiques des
- plongées effectuées.
-</p>
+<p> +<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement + certaines plongées, à partir de tags ou de critères de plongées. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_vue">14.4. Vue</h3> +<div class="ulist"><ul> +<li> +<p> +<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de + <em>Subsurface</em> simultanément. +</p> +</li> +<li> +<p> +<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la + <strong>liste des plongées</strong>. +</p> +</li> +<li> +<p> +<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la + plongée</strong>. +</p> +</li> +<li> +<p> +<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>. +</p> +</li> +<li> +<p> +<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte + mondiale</strong>. +</p> +</li> +<li> +<p> +<em>Statistiques annuelles</em> - Affiche par année le résumé des statistiques des + plongées effectuées. +</p> </li> <li> <p> @@ -5177,67 +5177,67 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p> </li> <li> -<p>
-<em>Ordinateur suivant</em> - Passer à l’ordinateur de plongée suivant.
-</p>
-</li>
-<li>
-<p>
-<em>Plein écran</em> - Passer en mode plein écran.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_share_on">14.5. Share on</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_Facebook"><em>Facebook</em></a> - Partager la plongée sélectionnée sur votre
- Facebook.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_aide">14.6. Aide</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>À propos de Subsurface</em> - Affiche un panneau avec le numéro de version de
- <em>Subsurface</em> ainsi que les informations de licence.
-</p>
-</li>
-<li>
-<p>
-<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de
- Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
- <em>Subsurface</em> </a>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aider à rendre <em>Subsurface</em> encore
- meilleur en répondant à notre sondage utilisateur ou en répondant à un autre
- sondage, si vos habitudes de plongées ont changées.
-</p>
-</li>
-<li>
-<p>
-<em>Manuel utilisateur</em> - Ouvre une fenêtre affichant ce manuel utilisateur.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">15. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>
-<div class="admonitionblock">
-<table><tr>
+<p> +<em>Ordinateur suivant</em> - Passer à l’ordinateur de plongée suivant. +</p> +</li> +<li> +<p> +<em>Plein écran</em> - Passer en mode plein écran. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_share_on">14.5. Share on</h3> +<div class="ulist"><ul> +<li> +<p> +<a href="#S_Facebook"><em>Facebook</em></a> - Partager la plongée sélectionnée sur votre + Facebook. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_aide">14.6. Aide</h3> +<div class="ulist"><ul> +<li> +<p> +<em>À propos de Subsurface</em> - Affiche un panneau avec le numéro de version de + <em>Subsurface</em> ainsi que les informations de licence. +</p> +</li> +<li> +<p> +<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de + Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de + <em>Subsurface</em> </a>. +</p> +</li> +<li> +<p> +<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aider à rendre <em>Subsurface</em> encore + meilleur en répondant à notre sondage utilisateur ou en répondant à un autre + sondage, si vos habitudes de plongées ont changées. +</p> +</li> +<li> +<p> +<em>Manuel utilisateur</em> - Ouvre une fenêtre affichant ce manuel utilisateur. +</p> +</li> +</ul></div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">15. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3> +<div class="admonitionblock"> +<table><tr> <td class="icon"> <img src="images/icons/drivers.jpg" alt="Note" /> </td> @@ -5247,35 +5247,35 @@ prefers (e.g. Bluetooth, USB, infra-red).</td> </tr></table> </div> <div class="ulist"><ul> -<li>
-<p>
-Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
- plupart des distributions Linux le font automatiquement, de telle sorte que
- l’utilisateur n’ait rien à faire de particulier. Cependant, certains
- protocoles de communication nécessitent des pilotes additionnels, plus
- particulièrement pour certaines technologies telles que l’infra-rouge.
-</p>
-</li>
-<li>
-<p>
-Sous Windows, le bon pilote devrait être téléchargé automatiquement la
- première fois que l’utilisateur branche son ordinateur de plongée sur le
- port USB de son ordinateur de bureau.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer
-manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe
-quel autre ordinateur de plongée utilisant une interface USB-série basé sur
-le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
-sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
-<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt
-de documents et logiciels Silicon Labs</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>
-<div class="admonitionblock">
-<table><tr>
+<li> +<p> +Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La + plupart des distributions Linux le font automatiquement, de telle sorte que + l’utilisateur n’ait rien à faire de particulier. Cependant, certains + protocoles de communication nécessitent des pilotes additionnels, plus + particulièrement pour certaines technologies telles que l’infra-rouge. +</p> +</li> +<li> +<p> +Sous Windows, le bon pilote devrait être téléchargé automatiquement la + première fois que l’utilisateur branche son ordinateur de plongée sur le + port USB de son ordinateur de bureau. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer +manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe +quel autre ordinateur de plongée utilisant une interface USB-série basé sur +le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible +sous <em>Mac_OSX_VCP_Driver.zip</em> sur le +<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt +de documents et logiciels Silicon Labs</a>.</p></div> +</div> +<div class="sect2"> +<h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3> +<div class="admonitionblock"> +<table><tr> <td class="icon"> <img src="images/icons/usb.jpg" alt="Note" /> </td> @@ -5287,57 +5287,57 @@ this doesn’t work, here are some ways to find out what the device name is: </tr></table> </div> <div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir -tous les périphériques COM connectés.</p></div>
-<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
-connectés.</p></div>
-<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Déconnecter le cable USB de l’ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Ouvrir un terminal
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-<li>
-<p>
-Connecter le cable USB de l’ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd
-usbcore: registered new interface driver usbserial
-USB Serial support registered for generic
-usbcore: registered new interface driver usbserial_generic
-usbserial: USB Serial Driver core
-USB Serial support registered for FTDI USB Serial Device
-ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected
-usb 2-1.1: Detected FT232BM
-usb 2-1.1: Number of endpoints 2
-usb 2-1.1: Endpoint 1 MaxPacketSize 64
-usb 2-1.1: Endpoint 2 MaxPacketSize 64
-usb 2-1.1: Setting MaxPacketSize 64
-usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3
-usbcore: registered new interface driver ftdi_sio
-ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
-</div></div>
-<div class="paragraph"><p>La troisième ligne en partant du bas montre que l’adaptateur FTDI USB est
+tous les périphériques COM connectés.</p></div> +<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée +connectés.</p></div> +<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div> +<div class="ulist"><ul> +<li> +<p> +Déconnecter le cable USB de l’ordinateur de plongée +</p> +</li> +<li> +<p> +Ouvrir un terminal +</p> +</li> +<li> +<p> +Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer +</p> +</li> +<li> +<p> +Connecter le cable USB de l’ordinateur de plongée +</p> +</li> +<li> +<p> +Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer +</p> +</li> +</ul></div> +<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd +usbcore: registered new interface driver usbserial +USB Serial support registered for generic +usbcore: registered new interface driver usbserial_generic +usbserial: USB Serial Driver core +USB Serial support registered for FTDI USB Serial Device +ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected +usb 2-1.1: Detected FT232BM +usb 2-1.1: Number of endpoints 2 +usb 2-1.1: Endpoint 1 MaxPacketSize 64 +usb 2-1.1: Endpoint 2 MaxPacketSize 64 +usb 2-1.1: Setting MaxPacketSize 64 +usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3 +usbcore: registered new interface driver ftdi_sio +ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre> +</div></div> +<div class="paragraph"><p>La troisième ligne en partant du bas montre que l’adaptateur FTDI USB est détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être utilisée pour les paramètres d’importation en tant que <code>/dev/ttyUSB3</code> pour que Subsurface utilise le bon port USB.</p></div> @@ -5352,8 +5352,8 @@ USB port. Let us assume one’s username is <em>johnB</em>.</p></div> <div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs d’Ubuntu : <code>sudo usermod -a -G dialout johnB</code>) Cela ajoute johnB au groupe <code>dialout</code>. -Tapez : <code>id johnB</code> Cela liste tous les groupes auquel johnB appartient et
-vérifiez que
+Tapez : <code>id johnB</code> Cela liste tous les groupes auquel johnB appartient et +vérifiez que l’appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait être listé parmi les différents IDs. @@ -5363,12 +5363,12 @@ puis reconnexion sur l’ordinateur (sous Ubuntu, par exemple).</p></div> en écriture au port USB, l’ordinateur de plongée devrait se connecter et vous devriez pouvoir importer vos plongées.</p></div> </div> -<div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/bluetooth.jpg" alt="Note" />
+<div class="sect2"> +<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/bluetooth.jpg" alt="Note" /> </td> <td class="content">For dive computers communicating through Bluetooth like the Heinrichs Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a @@ -5383,33 +5383,33 @@ different procedure to get the device’s name to communicate with </p> </li> </ul></div> -<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user
-guide. When using a Shearwater Predator/Petrel/Nerd, select <em>Dive Log →
-Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
-</p>
-</li>
-</ul></div>
-<div class="sect3">
-<h4 id="_sur_windows_2">15.3.1. Sur Windows :</h4>
-<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
-choose <em>Control Panel → Bluetooth Devices → Add Wireless Device</em>. This
-should bring up a dialog showing your dive computer (which should be in
-Bluetooth mode) and allowing pairing. Right click on it and choose
-<em>Properties→ COM Ports</em> to identify the port used for your dive
-computer. If there are several ports listed, use the one saying "Outgoing"
-instead of "Incoming".</p></div>
-<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
-contain this COM port already. If not, enter it manually.</p></div>
-<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
-using other software, remove the existing pairing with the dive computer.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>
-<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
+<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user +guide. When using a Shearwater Predator/Petrel/Nerd, select <em>Dive Log → +Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div> +<div class="ulist"><ul> +<li> +<p> +<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong> +</p> +</li> +</ul></div> +<div class="sect3"> +<h4 id="_sur_windows_2">15.3.1. Sur Windows :</h4> +<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer +choose <em>Control Panel → Bluetooth Devices → Add Wireless Device</em>. This +should bring up a dialog showing your dive computer (which should be in +Bluetooth mode) and allowing pairing. Right click on it and choose +<em>Properties→ COM Ports</em> to identify the port used for your dive +computer. If there are several ports listed, use the one saying "Outgoing" +instead of "Incoming".</p></div> +<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should +contain this COM port already. If not, enter it manually.</p></div> +<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer +using other software, remove the existing pairing with the dive computer.</p></div> +</div> +<div class="sect3"> +<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4> +<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth Device…</em>. The dive computer should then show up in the list of devices. Select it and go through the pairing process. This step should only be needed once for initial setup.</p></div> @@ -5428,42 +5428,42 @@ a USB dongle that came with your dive computer, try that before any others.</p>< <div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and will generally require the command prompt. It is essentially a three step -process.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Enable the Bluetooth controller and pair your dive computer
-</p>
-</li>
-<li>
-<p>
-Establish an RFCOMM connection
-</p>
-</li>
-<li>
-<p>
-Download the dives with Subsurface
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>,
-<em>Petrel 2</em> and <em>Nerd</em> cycle through the menu, select <em>Dive Log</em>, then
-<em>Upload Log</em>. The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and
-will countdown. Once the connection is established, the display reads <em>Wait
-CMD …</em> and the countdown continues. When downloading the dive from
-Subsurface, the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
-<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
-The correct permission is required to download the dives in the computer. On
-most Linux systems this means becoming a member of the dialout group (This
-is identical as for many dive computers using a Linux USB port, described in
-the previous section). On the command terminal, enter:</p></div>
-<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
-<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
-<div class="sect4">
-<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
-<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
-the graphical environment of the operating system. After setting the dive
-computer to upload mode, click the Bluetooth icon in the system tray and
+process.</p></div> +<div class="ulist"><ul> +<li> +<p> +Enable the Bluetooth controller and pair your dive computer +</p> +</li> +<li> +<p> +Establish an RFCOMM connection +</p> +</li> +<li> +<p> +Download the dives with Subsurface +</p> +</li> +</ul></div> +<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>, +<em>Petrel 2</em> and <em>Nerd</em> cycle through the menu, select <em>Dive Log</em>, then +<em>Upload Log</em>. The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and +will countdown. Once the connection is established, the display reads <em>Wait +CMD …</em> and the countdown continues. When downloading the dive from +Subsurface, the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div> +<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>. +The correct permission is required to download the dives in the computer. On +most Linux systems this means becoming a member of the dialout group (This +is identical as for many dive computers using a Linux USB port, described in +the previous section). On the command terminal, enter:</p></div> +<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div> +<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div> +<div class="sect4"> +<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5> +<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using +the graphical environment of the operating system. After setting the dive +computer to upload mode, click the Bluetooth icon in the system tray and select <em>Add new device</em>. The dive computer should appear. If asked for a password, enter 0000. Write down or copy the MAC address of your dive computer - this needed later and should be in the form 00:11:22:33:44:55.</p></div> @@ -5471,190 +5471,190 @@ computer - this needed later and should be in the form 00:11:22:33:44:55.</p></ line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller status</p></div> <div class="literalblock"> -<div class="content">
-<pre><code>$ hciconfig
-hci0: Type: BR/EDR Bus: USB
- BD Address: 01:23:45:67:89:AB ACL MTU: 310:10 SCO MTU: 64:8
- *DOWN*
- RX bytes:504 acl:0 sco:0 events:22 errors:0
- TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
-connected as hci0. Its status is <em>DOWN</em>, i.e. not powered. Additional
-controllers will appear as hci1, etc. If there is not a Bluetooth dongle
-plugged in upon booting the computer, hci0 is probably the onboard. Now
-power on the controller and enable authentication:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci0 up auth+ (enter password when prompted)
-hciconfig
-hci0: Type: BR/EDR Bus: USB
- BD Address: 01:23:45:67:89:AB ACL MTU: 310:10 SCO MTU: 64:8
- *UP RUNNING PSCAN AUTH*
- RX bytes:1026 acl:0 sco:0 events:47 errors:0
- TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
-<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to off the unused
-controller(s). For example, for <code>hci1</code>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci1 down</code></pre>
-</div></div>
-<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
-5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
-bring up its own command prompt.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>bluetoothctl
-[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
-[bluetooth]# agent on
-Agent registered
-[bluetooth]# default-agent
-Default agent request successful
-[bluetooth]# scan on <----now set your dive computer to upload mode
-Discovery started
-[CHG] Controller 01:23:45:67:89:AB Discovering: yes
-[NEW] Device 00:11:22:33:44:55 Petrel
-[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to autocomplete the MAC address
-[CHG] Device 00:11:22:33:44:55 Trusted: yes
-Changing 00:11:22:33:44:55 trust succeeded
-[bluetooth]# pair 00:11:22:33:44:55
-Attempting to pair with 00:11:22:33:44:55
-[CHG] Device 00:11:22:33:44:55 Connected: yes
-[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
-[CHG] Device 00:11:22:33:44:55 Paired: yes
-Pairing successful
-[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
-</div></div>
-<div class="paragraph"><p>If asked for a password, enter 0000. It’s ok if the last line says
-<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
-<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
-there is probably not a <code>bluetoothctl</code>, but a script called
-<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>hcitool -i hci0 scanning
-Scanning ...
- 00:11:22:33:44:55 Petrel
- bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
-</div></div>
-<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
-</div>
-<div class="sect4">
-<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
-<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
-<div class="paragraph"><p><code>sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]</code></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<code><controller></code> is the Bluetooth controller, <code>hci0</code>.
-</p>
-</li>
-<li>
-<p>
-<code><dev></code> is the RFCOMM device file, <code>rfcomm0</code>
-</p>
-</li>
-<li>
-<p>
-<code><bdaddr></code> is the dive computer’s MAC address, <code>00:11:22:33:44:55</code>
-</p>
-</li>
-<li>
-<p>
-<code>[channel]</code> is the dive computer’s Bluetooth channel we need to connect to.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If one omits it, channel 1 is assumed. Based on a limited number of user
-reports, the appropriate channel for the dive computer is probably:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Shearwater Petrel 1</em>: channel 1
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Petrel 2</em>: channel 5
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Nerd</em>: channel 5
-</p>
-</li>
-<li>
-<p>
-<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
-mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
-</div></div>
-<div class="paragraph"><p>This gives the response:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
-computer to upload mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)
-Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
-in the list above doesn’t work, the command <code>sdptool records</code> should help
-determine the appropriate channel. The output below is for a <em>Shearwater
-Petrel 2</em>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
-Service Name: Serial Port
-Service RecHandle: 0x10000
-Service Class ID List:
- "Serial Port" (0x1101)
- Protocol Descriptor List:
- "L2CAP" (0x0100)
- "RFCOMM" (0x0003)
- Channel: 5</code></pre>
-</div></div>
-<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
-listed is not correct, please let the Subsurface developers know on the user
-forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
-<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer’s
-upload mode countdown is still running, go to_Subsurface_, select
-<em>Import→Import from dive computer</em> and enter appropriate Vendor
-(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
-(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="S_ImportUemis">16.1. Importing from Uemis Zurich</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/iumis.jpg" alt="Note" />
-</td>
-<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
-system of the Uemis) including information about dive spots and
+<div class="content"> +<pre><code>$ hciconfig +hci0: Type: BR/EDR Bus: USB + BD Address: 01:23:45:67:89:AB ACL MTU: 310:10 SCO MTU: 64:8 + *DOWN* + RX bytes:504 acl:0 sco:0 events:22 errors:0 + TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre> +</div></div> +<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, +connected as hci0. Its status is <em>DOWN</em>, i.e. not powered. Additional +controllers will appear as hci1, etc. If there is not a Bluetooth dongle +plugged in upon booting the computer, hci0 is probably the onboard. Now +power on the controller and enable authentication:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>sudo hciconfig hci0 up auth+ (enter password when prompted) +hciconfig +hci0: Type: BR/EDR Bus: USB + BD Address: 01:23:45:67:89:AB ACL MTU: 310:10 SCO MTU: 64:8 + *UP RUNNING PSCAN AUTH* + RX bytes:1026 acl:0 sco:0 events:47 errors:0 + TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre> +</div></div> +<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div> +<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to off the unused +controller(s). For example, for <code>hci1</code>:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>sudo hciconfig hci1 down</code></pre> +</div></div> +<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez +5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will +bring up its own command prompt.</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>bluetoothctl +[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default] +[bluetooth]# agent on +Agent registered +[bluetooth]# default-agent +Default agent request successful +[bluetooth]# scan on <----now set your dive computer to upload mode +Discovery started +[CHG] Controller 01:23:45:67:89:AB Discovering: yes +[NEW] Device 00:11:22:33:44:55 Petrel +[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to autocomplete the MAC address +[CHG] Device 00:11:22:33:44:55 Trusted: yes +Changing 00:11:22:33:44:55 trust succeeded +[bluetooth]# pair 00:11:22:33:44:55 +Attempting to pair with 00:11:22:33:44:55 +[CHG] Device 00:11:22:33:44:55 Connected: yes +[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345 +[CHG] Device 00:11:22:33:44:55 Paired: yes +Pairing successful +[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre> +</div></div> +<div class="paragraph"><p>If asked for a password, enter 0000. It’s ok if the last line says +<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div> +<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), +there is probably not a <code>bluetoothctl</code>, but a script called +<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>hcitool -i hci0 scanning +Scanning ... + 00:11:22:33:44:55 Petrel + bluez-simple-agent hci0 00:11:22:33:44:55</code></pre> +</div></div> +<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div> +</div> +<div class="sect4"> +<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5> +<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div> +<div class="paragraph"><p><code>sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]</code></p></div> +<div class="ulist"><ul> +<li> +<p> +<code><controller></code> is the Bluetooth controller, <code>hci0</code>. +</p> +</li> +<li> +<p> +<code><dev></code> is the RFCOMM device file, <code>rfcomm0</code> +</p> +</li> +<li> +<p> +<code><bdaddr></code> is the dive computer’s MAC address, <code>00:11:22:33:44:55</code> +</p> +</li> +<li> +<p> +<code>[channel]</code> is the dive computer’s Bluetooth channel we need to connect to. +</p> +</li> +</ul></div> +<div class="paragraph"><p>If one omits it, channel 1 is assumed. Based on a limited number of user +reports, the appropriate channel for the dive computer is probably:</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Shearwater Petrel 1</em>: channel 1 +</p> +</li> +<li> +<p> +<em>Shearwater Petrel 2</em>: channel 5 +</p> +</li> +<li> +<p> +<em>Shearwater Nerd</em>: channel 5 +</p> +</li> +<li> +<p> +<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1 +</p> +</li> +</ul></div> +<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload +mode and enter:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre> +</div></div> +<div class="paragraph"><p>This gives the response:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5 +Press CTRL-C for hangup</code></pre> +</div></div> +<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive +computer to upload mode and enter:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted) +Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1 +Press CTRL-C for hangup</code></pre> +</div></div> +<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel +in the list above doesn’t work, the command <code>sdptool records</code> should help +determine the appropriate channel. The output below is for a <em>Shearwater +Petrel 2</em>.</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>sdptool -i hci0 records 00:11:22:33:44:55 +Service Name: Serial Port +Service RecHandle: 0x10000 +Service Class ID List: + "Serial Port" (0x1101) + Protocol Descriptor List: + "L2CAP" (0x0100) + "RFCOMM" (0x0003) + Channel: 5</code></pre> +</div></div> +<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel +listed is not correct, please let the Subsurface developers know on the user +forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div> +</div> +<div class="sect4"> +<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5> +<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer’s +upload mode countdown is still running, go to_Subsurface_, select +<em>Import→Import from dive computer</em> and enter appropriate Vendor +(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point +(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div> +</div> +</div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="S_ImportUemis">16.1. Importing from Uemis Zurich</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/iumis.jpg" alt="Note" /> +</td> +<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file +system of the Uemis) including information about dive spots and equipment. Buddy information is not yet downloadable. Things are very similar to a normal USB-connected dive computer (the Uemis is one of those that recharge when connected to the USB port). The main difference is that @@ -5664,8 +5664,8 @@ is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is <em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the distribution. On Fedora it usually is <em>/var/run/media/<your_username>/UEMISSDA</em>. In all cases <em>Subsurface</em> should -suggest the correct location in the drop down list.</td>
-</tr></table>
+suggest the correct location in the drop down list.</td> +</tr></table> </div> <div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis Zurich. One technical issue with the Uemis Zurich download implementation @@ -5681,22 +5681,22 @@ download will continue where it stopped previously. You may have to do this more than once, depending on how many dives are stored on the dive computer.</p></div> </div> <div class="sect2"> -<h3 id="S_ImportingGalileo">16.2. Importing from Uwatec Galileo</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/Galileo.jpg" alt="Note" />
-</td>
-<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
-the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
-based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
-manufactured by MosChip and marketed by Scubapro and some electronics
-companies. Under Linux, the kernel already provides for communication using
-the IrDA protocol. However, the user additionally needs to load a driver for
-the IrDA interface with the dive computer. The easiest way is to load the
-<strong>irda-tools</strong> package from the
-<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>. After
-the installation of the irda-tools, the <strong>root user</strong> can specify a device
+<h3 id="S_ImportingGalileo">16.2. Importing from Uwatec Galileo</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/Galileo.jpg" alt="Note" /> +</td> +<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between +the dive computer and Subsurface. The Uwatec hardware uses a USB dongle +based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller +manufactured by MosChip and marketed by Scubapro and some electronics +companies. Under Linux, the kernel already provides for communication using +the IrDA protocol. However, the user additionally needs to load a driver for +the IrDA interface with the dive computer. The easiest way is to load the +<strong>irda-tools</strong> package from the +<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>. After +the installation of the irda-tools, the <strong>root user</strong> can specify a device name from the console as follows: <code>irattach irda0</code></td> </tr></table> </div> @@ -5710,64 +5710,64 @@ ScubaPro web site, with drivers located on the download page for the ScubaPro SmartTrak software.</p></div> <div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available for OSX 10.6 or higher.</p></div> -</div>
-<div class="sect2">
-<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/HW_DR5.jpg" alt="Note" />
-</td>
-<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
-file for every dive. Mark all the dives you’d like to import or open.
-Note: The DR5 does not seem to store gradient factors nor deco information,
-so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient
-factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay
-in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco
-calculated by <em>Subsurface</em> will most likely differ from the one displayed on
-the DR5.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingXDeep">16.4. Importing from xDEEP BLACK</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/HW_xdeepblack.jpg" alt="Note" />
-</td>
-<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF"
-option in BLACK’s logbook menu. When mounted as a USB drive UDDF files are
-available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but
-does not seem to store gradient factors nor deco information, so for
-<em>Subsurface</em> it is not possible to display them. Adjust the gradient factors
-in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the
-<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated
-by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP
-BLACK.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/predator.jpg" alt="Note" />
-</td>
-<td class="content">Specific instructions for downloading dives using Bluetooth are given in the
-section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/MkVI.jpeg" alt="Note" />
-</td>
-<td class="content">Download of dive logs from the MkVI is performed using a custom
+</div> +<div class="sect2"> +<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/HW_DR5.jpg" alt="Note" /> +</td> +<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF +file for every dive. Mark all the dives you’d like to import or open. +Note: The DR5 does not seem to store gradient factors nor deco information, +so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient +factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay +in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco +calculated by <em>Subsurface</em> will most likely differ from the one displayed on +the DR5.</td> +</tr></table> +</div> +</div> +<div class="sect2"> +<h3 id="S_ImportingXDeep">16.4. Importing from xDEEP BLACK</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/HW_xdeepblack.jpg" alt="Note" /> +</td> +<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF" +option in BLACK’s logbook menu. When mounted as a USB drive UDDF files are +available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but +does not seem to store gradient factors nor deco information, so for +<em>Subsurface</em> it is not possible to display them. Adjust the gradient factors +in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the +<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated +by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP +BLACK.</td> +</tr></table> +</div> +</div> +<div class="sect2"> +<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/predator.jpg" alt="Note" /> +</td> +<td class="content">Specific instructions for downloading dives using Bluetooth are given in the +section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td> +</tr></table> +</div> +</div> +<div class="sect2"> +<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/MkVI.jpeg" alt="Note" /> +</td> +<td class="content">Download of dive logs from the MkVI is performed using a custom communications adapter and the <em>Poseidon PC Configuration Software</em>, obtained when purchasing the MKVI equipment. The latter is a Windows application allowing configuration of equipment and storage of dive @@ -5777,21 +5777,21 @@ in three files:</td> </tr></table> </div> <div class="ulist"><ul> -<li>
-<p>
-Setup configuration for the dive and key dive parameters (file with a .txt
- extension)
-</p>
-</li>
-<li>
-<p>
-Dive log details (file with a .csv extension)
-</p>
-</li>
-<li>
-<p>
-Redbook format dive log (file with .cvsr extension). This is a compressed
- version of the dive log using a proprietary format.
+<li> +<p> +Setup configuration for the dive and key dive parameters (file with a .txt + extension) +</p> +</li> +<li> +<p> +Dive log details (file with a .csv extension) +</p> +</li> +<li> +<p> +Redbook format dive log (file with .cvsr extension). This is a compressed + version of the dive log using a proprietary format. </p> </li> </ul></div> @@ -5799,59 +5799,59 @@ Redbook format dive log (file with .cvsr extension). This is a compressed information.</p></div> </div> <div class="sect2"> -<h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/APDComputer.jpg" alt="Note" />
-</td>
-<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
-downloaded using a communications adapter and <em>AP Communicator</em>, obtained
-when purchasing the equipment. The dive logs can be viewed using the <em>AP Log
-Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and
-managed from within <em>Subsurface</em> (together with dives using many other types
-of dive computer). The APD inspiration dive logs are imported into
-<em>Subsurface</em> as follows:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Download the dive using <em>AP Communicator</em>.
-</p>
-</li>
-<li>
-<p>
-Open a dive within the <em>AP Log Viewer</em>.
-</p>
-</li>
-<li>
-<p>
-Select the tab at the top of the screen, entitled "<em>Data</em>".
-</p>
-</li>
-<li>
-<p>
-With the raw dive log data show on the screen, click on "<em>Copy to
- Clipboard</em>".
-</p>
-</li>
-<li>
-<p>
-Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
-</p>
-</li>
-<li>
-<p>
-Copy the contents of the clipboard into the text editor and save the text
- file with a filename extension of <em>.apd</em>
-</p>
-</li>
-<li>
-<p>
-Within <em>Subsurface</em>, select <em>Import → Import log files</em> to open the
- <a href="#Unified_import">universal import dialogue</a>.
-</p>
+<h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/APDComputer.jpg" alt="Note" /> +</td> +<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are +downloaded using a communications adapter and <em>AP Communicator</em>, obtained +when purchasing the equipment. The dive logs can be viewed using the <em>AP Log +Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and +managed from within <em>Subsurface</em> (together with dives using many other types +of dive computer). The APD inspiration dive logs are imported into +<em>Subsurface</em> as follows:</td> +</tr></table> +</div> +<div class="ulist"><ul> +<li> +<p> +Download the dive using <em>AP Communicator</em>. +</p> +</li> +<li> +<p> +Open a dive within the <em>AP Log Viewer</em>. +</p> +</li> +<li> +<p> +Select the tab at the top of the screen, entitled "<em>Data</em>". +</p> +</li> +<li> +<p> +With the raw dive log data show on the screen, click on "<em>Copy to + Clipboard</em>". +</p> +</li> +<li> +<p> +Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac). +</p> +</li> +<li> +<p> +Copy the contents of the clipboard into the text editor and save the text + file with a filename extension of <em>.apd</em> +</p> +</li> +<li> +<p> +Within <em>Subsurface</em>, select <em>Import → Import log files</em> to open the + <a href="#Unified_import">universal import dialogue</a>. +</p> </li> <li> <p> @@ -5864,11 +5864,11 @@ dialogue opens showing the default settings for the data in the </p> </li> </ul></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
-</div>
-</div>
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" /> +</div> +</div> <div class="ulist"><ul> <li> <p> @@ -5882,8 +5882,8 @@ The top left hand dropdown box in the import panel lets you select the APD </p> </li> <li> -<p>
-Click the <em>Ok</em> button at the bottom of the import panel.
+<p> +Click the <em>Ok</em> button at the bottom of the import panel. </p> </li> </ul></div> @@ -5895,131 +5895,131 @@ are not logged by the APD equipment but can be manually entered in the </div> </div> </div> -<div class="sect1">
-<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">17. APPENDIX C: Exporting Dive log information from external dive log software.</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The import of dive log data from external dive log software is mostly
-performed using the dialogue found by selecting <em>Import</em> from the Main Menu,
-then clicking on <em>Import Log Files</em>. This is a single-step process, more
-information about which can be found <a href="#Unified_import">here.</a> However, in
-some cases, a two-step process may be required:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Export the foreign dive log data to format that is accessible from
- <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-Import the accessible dive log data into <em>Subsurface</em>.
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
-data from foreign dive log software. The procedures below mostly apply to
-Linux and/or Windows.</p></div>
-<div class="sect2">
-<h3 id="S_ImportingDivesSuunto">17.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/suuntologo.jpg" alt="Note" />
-</td>
-<td class="content">DiveManager is a MS Windows application for Suunto dive computers.
-Divemanager 3 (DM3) is an older version of the Suunto software. More recent
-Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The
-different versions of Divemanager use different methods and different file
-naming conventions to export dive log data.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
-</p>
-</li>
-<li>
-<p>
-Do not start the import wizard to import dives from the dive computer.
-</p>
-</li>
-<li>
-<p>
-In the navigation tree on the left side of the program-window, select the
- appropriate dives.
-</p>
-</li>
-<li>
-<p>
-Within the list of dives, select the dives you would like to import later:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-To select certain dives: hold <em>ctrl</em> and click the dive
-</p>
-</li>
-<li>
-<p>
-To select all dives: Select the first dive, hold down shift and select the
- last dive
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-With the dives marked, use the program menu <em>File → Export</em>
-</p>
-</li>
-<li>
-<p>
-The export pop-up will show. Within this pop-up, there is one field called
- <em>Export Path</em>.
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Click the browse button next to the field Export Path
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-A file-manager like window pops up
-</p>
-</li>
-<li>
-<p>
-Navigate to the directory for storing the
- Divelog.SDE file
-</p>
-</li>
-<li>
-<p>
-Optionally change the name of the file for saving
-</p>
-</li>
-<li>
-<p>
-Click <em>Save</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Back in the Export pop-up, press the button <em>Export</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-The dives are now exported to the file Divelog.SDE.
-</p>
-</li>
+<div class="sect1"> +<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">17. APPENDIX C: Exporting Dive log information from external dive log software.</h2> +<div class="sectionbody"> +<div class="paragraph"><p>The import of dive log data from external dive log software is mostly +performed using the dialogue found by selecting <em>Import</em> from the Main Menu, +then clicking on <em>Import Log Files</em>. This is a single-step process, more +information about which can be found <a href="#Unified_import">here.</a> However, in +some cases, a two-step process may be required:</p></div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +Export the foreign dive log data to format that is accessible from + <em>Subsurface</em>. +</p> +</li> +<li> +<p> +Import the accessible dive log data into <em>Subsurface</em>. +</p> +</li> +</ol></div> +<div class="paragraph"><p>This appendix provides some information about approaches to export dive log +data from foreign dive log software. The procedures below mostly apply to +Linux and/or Windows.</p></div> +<div class="sect2"> +<h3 id="S_ImportingDivesSuunto">17.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/suuntologo.jpg" alt="Note" /> +</td> +<td class="content">DiveManager is a MS Windows application for Suunto dive computers. +Divemanager 3 (DM3) is an older version of the Suunto software. More recent +Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The +different versions of Divemanager use different methods and different file +naming conventions to export dive log data.</td> +</tr></table> +</div> +<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs +</p> +</li> +<li> +<p> +Do not start the import wizard to import dives from the dive computer. +</p> +</li> +<li> +<p> +In the navigation tree on the left side of the program-window, select the + appropriate dives. +</p> +</li> +<li> +<p> +Within the list of dives, select the dives you would like to import later: +</p> +<div class="ulist"><ul> +<li> +<p> +To select certain dives: hold <em>ctrl</em> and click the dive +</p> +</li> +<li> +<p> +To select all dives: Select the first dive, hold down shift and select the + last dive +</p> +</li> +</ul></div> +</li> +<li> +<p> +With the dives marked, use the program menu <em>File → Export</em> +</p> +</li> +<li> +<p> +The export pop-up will show. Within this pop-up, there is one field called + <em>Export Path</em>. +</p> +<div class="ulist"><ul> +<li> +<p> +Click the browse button next to the field Export Path +</p> +<div class="ulist"><ul> +<li> +<p> +A file-manager like window pops up +</p> +</li> +<li> +<p> +Navigate to the directory for storing the + Divelog.SDE file +</p> +</li> +<li> +<p> +Optionally change the name of the file for saving +</p> +</li> +<li> +<p> +Click <em>Save</em> +</p> +</li> +</ul></div> +</li> +<li> +<p> +Back in the Export pop-up, press the button <em>Export</em> +</p> +</li> +</ul></div> +</li> +<li> +<p> +The dives are now exported to the file Divelog.SDE. +</p> +</li> </ol></div> <div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div> <div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs. To export a @@ -6029,19 +6029,19 @@ backup of the dives. Both methods are described here.</p></div> <div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div> <div class="olist arabic"><ol class="arabic"> <li> -<p>
-Start Suunto DM4/DM5
-</p>
-</li>
-<li>
-<p>
-Select <em>Help → About</em>
-</p>
-</li>
-<li>
-<p>
-Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
-</p>
+<p> +Start Suunto DM4/DM5 +</p> +</li> +<li> +<p> +Select <em>Help → About</em> +</p> +</li> +<li> +<p> +Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em> +</p> </li> <li> <p> @@ -6049,65 +6049,65 @@ Ouvrir l’explorateur Windows </p> </li> <li> -<p>
-Paste the address to the path box at the top of the File Explorer
-</p>
-</li>
-<li>
-<p>
-The database is called DM4.db or DM5.db
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>Making a backup copy of the Suunto DM4/DM5 database:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Start Suunto DM4/DM5
-</p>
-</li>
-<li>
-<p>
-Select <em>File - Create backup</em>
-</p>
-</li>
-<li>
-<p>
-From the file menu select the location and name for the backup, we’ll use
- DM4 (or DM5) in here with the default extension .bak
-</p>
-</li>
-<li>
-<p>
-Click <em>Save</em>
-</p>
-</li>
-<li>
-<p>
-The dives are now exported to the file DM4.bak (or DM5.bak)
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect2">
-<h3 id="_exporting_from_atomic_logbook">17.2. Exporting from Atomic Logbook</h3>
-<div class="admonitionblock" id="Atomic_Export">
-<table><tr>
-<td class="icon">
-<img src="images/icons/atomiclogo.jpg" alt="Note" />
-</td>
-<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
-downloading of dive information from Cobalt and Cobalt 2 dive computers.
-The divelog is kept in a SQLite database at
-C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be
-directly imported to Subsurface.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_exporting_from_mares_dive_organiser_v2_1">17.3. Exporting from Mares Dive Organiser V2.1</h3>
-<div class="admonitionblock" id="Mares_Export">
-<table><tr>
+<p> +Paste the address to the path box at the top of the File Explorer +</p> +</li> +<li> +<p> +The database is called DM4.db or DM5.db +</p> +</li> +</ol></div> +<div class="paragraph"><p>Making a backup copy of the Suunto DM4/DM5 database:</p></div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +Start Suunto DM4/DM5 +</p> +</li> +<li> +<p> +Select <em>File - Create backup</em> +</p> +</li> +<li> +<p> +From the file menu select the location and name for the backup, we’ll use + DM4 (or DM5) in here with the default extension .bak +</p> +</li> +<li> +<p> +Click <em>Save</em> +</p> +</li> +<li> +<p> +The dives are now exported to the file DM4.bak (or DM5.bak) +</p> +</li> +</ol></div> +</div> +<div class="sect2"> +<h3 id="_exporting_from_atomic_logbook">17.2. Exporting from Atomic Logbook</h3> +<div class="admonitionblock" id="Atomic_Export"> +<table><tr> +<td class="icon"> +<img src="images/icons/atomiclogo.jpg" alt="Note" /> +</td> +<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows +downloading of dive information from Cobalt and Cobalt 2 dive computers. +The divelog is kept in a SQLite database at +C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be +directly imported to Subsurface.</td> +</tr></table> +</div> +</div> +<div class="sect2"> +<h3 id="_exporting_from_mares_dive_organiser_v2_1">17.3. Exporting from Mares Dive Organiser V2.1</h3> +<div class="admonitionblock" id="Mares_Export"> +<table><tr> <td class="icon"> <img src="images/icons/mareslogo.jpg" alt="Note" /> </td> @@ -6134,23 +6134,23 @@ Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a </p> </li> <li> -<p>
-Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
-</p>
-</li>
-<li>
-<p>
-The password for accessing the .zip file is <em>mares</em>.
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/divingloglogo.jpg" alt="Note" />
+<p> +Extract the <em>.sdf</em> file from the zipped folder to your Desktop. +</p> +</li> +<li> +<p> +The password for accessing the .zip file is <em>mares</em>. +</p> +</li> +</ol></div> +</div> +<div class="sect2"> +<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/divingloglogo.jpg" alt="Note" /> </td> <td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert the whole database. This is because other export formats do not include all @@ -6163,28 +6163,28 @@ and readily available.</td> <div class="olist arabic"><ol class="arabic"> <li> <p> -In DivingLog open the <em>File → Export → SQLite</em> menu
-</p>
-</li>
-<li>
-<p>
-Select <em>Settings</em> button
-</p>
-</li>
-<li>
-<p>
-Set the <em>RTF2Plaintext</em> to <em>true</em>
-</p>
-</li>
-<li>
-<p>
-Close the Settings dialog
-</p>
-</li>
-<li>
-<p>
-Click <em>Export</em> button and select the filename
-</p>
+In DivingLog open the <em>File → Export → SQLite</em> menu +</p> +</li> +<li> +<p> +Select <em>Settings</em> button +</p> +</li> +<li> +<p> +Set the <em>RTF2Plaintext</em> to <em>true</em> +</p> +</li> +<li> +<p> +Close the Settings dialog +</p> +</li> +<li> +<p> +Click <em>Export</em> button and select the filename +</p> </li> </ol></div> <div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the @@ -6211,25 +6211,25 @@ and Tags). Organize dive data following a few simple rules:</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> -Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
-</p>
-</li>
-<li>
-<p>
-Durée : le format est minutes:secondes.
-</p>
-</li>
-<li>
-<p>
-Système d’unité : un seul système d’unité doit être utilisé (pas de mélange
- entre les unités impériales et métriques)
-</p>
-</li>
-<li>
-<p>
-Étiquettes et équipiers : les valeurs doivent être séparées par des
- virgules.
-</p>
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa +</p> +</li> +<li> +<p> +Durée : le format est minutes:secondes. +</p> +</li> +<li> +<p> +Système d’unité : un seul système d’unité doit être utilisé (pas de mélange + entre les unités impériales et métriques) +</p> +</li> +<li> +<p> +Étiquettes et équipiers : les valeurs doivent être séparées par des + virgules. +</p> </li> <li> <p> @@ -6242,27 +6242,27 @@ Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 <div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open source office suite applications. The user interaction with <em>LibreOffice</em> and <em>OpenOffice</em> is very similar. In Libreoffice Calc the time format -should be set to minutes:seconds - [mm]:ss and dates should be set to one
-of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like
-this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" />
-</div>
-</div>
-<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File →
-Save As</em>. On the dialogue that comes up, select the <em>Text CSV (.csv)</em> as the
-file type and select the option <em>Edit filter settings</em>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LOffice_save_as_options.jpg" alt="FIGURE: Save as options" />
-</div>
-</div>
-<div class="paragraph"><p>After selecting <em>Save</em>, select the appropriate field delimiter (choose <em>Tab</em>
-to prevent conflicts with the comma when using this as a decimal point),
-then select <em>OK</em>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+should be set to minutes:seconds - [mm]:ss and dates should be set to one +of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like +this:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" /> +</div> +</div> +<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File → +Save As</em>. On the dialogue that comes up, select the <em>Text CSV (.csv)</em> as the +file type and select the option <em>Edit filter settings</em>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/LOffice_save_as_options.jpg" alt="FIGURE: Save as options" /> +</div> +</div> +<div class="paragraph"><p>After selecting <em>Save</em>, select the appropriate field delimiter (choose <em>Tab</em> +to prevent conflicts with the comma when using this as a decimal point), +then select <em>OK</em>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" /> </div> </div> @@ -6285,43 +6285,43 @@ In Microsoft Windows, click the <strong>Start</strong> button, then select <em>C </p> </li> <li> -<p>
-Open the <em>Regional and Language Options</em> dialog box.
-</p>
-</li>
-<li>
-<p>
-Do one of the following: <strong> In Windows 7, click the <em>Formats</em> tab, and then
- click <em>Customize this format</em>. </strong> In Windows XP, click the <em>Regional
- Options</em> tab, and then click <em>Customize</em>.
-</p>
-</li>
-<li>
-<p>
-Type a new separator in the <em>List separator</em> box. To use a TAB-delimited
- file, type the word TAB in the box.
-</p>
-</li>
-<li>
-<p>
-Click <em>OK</em> twice.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Below is an image of the <em>Control Panel</em>:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Win_SaveCSV2.jpg" alt="FIGURE: Win List separator" />
-</div>
-</div>
-<div class="paragraph"><p>To export the dive log in CSV format:</p></div>
-<div class="paragraph"><p>With the dive log opened in <em>Excel</em>, select the round Windows button at the
-top left, then <em>Save As</em>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Win_SaveCSV1.jpg" alt="FIGURE: Excel save as option" />
-</div>
-</div>
+<p> +Open the <em>Regional and Language Options</em> dialog box. +</p> +</li> +<li> +<p> +Do one of the following: <strong> In Windows 7, click the <em>Formats</em> tab, and then + click <em>Customize this format</em>. </strong> In Windows XP, click the <em>Regional + Options</em> tab, and then click <em>Customize</em>. +</p> +</li> +<li> +<p> +Type a new separator in the <em>List separator</em> box. To use a TAB-delimited + file, type the word TAB in the box. +</p> +</li> +<li> +<p> +Click <em>OK</em> twice. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Below is an image of the <em>Control Panel</em>:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Win_SaveCSV2.jpg" alt="FIGURE: Win List separator" /> +</div> +</div> +<div class="paragraph"><p>To export the dive log in CSV format:</p></div> +<div class="paragraph"><p>With the dive log opened in <em>Excel</em>, select the round Windows button at the +top left, then <em>Save As</em>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Win_SaveCSV1.jpg" alt="FIGURE: Excel save as option" /> +</div> +</div> <div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the right-hand. This brings up a dialogue for saving the spreadsheet in an alternative format. From the dropdown list at the bottom of the dialogue, @@ -6338,7 +6338,7 @@ text editor, then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> </div> </div> -</div>
+</div> <div class="sect1"> <h2 id="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d’impression personnalisé</h2> <div class="sectionbody"> @@ -6403,12 +6403,12 @@ end. It is possible to iterate over the list as follows: <div class="content"> <pre><code> {% for dive in dives %} <h1> {{ dive.number }} </h1> - {% endfor %}</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code> <h1> 1 </h1>
+ {% endfor %}</code></pre> +</div></div> +<div class="literalblock"> +<div class="title">output.html</div> +<div class="content"> +<pre><code> <h1> 1 </h1> <h1> 2 </h1> <h1> 3 </h1></code></pre> </div></div> @@ -6416,27 +6416,27 @@ end. It is possible to iterate over the list as follows: <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div> </div> <div class="sect2"> -<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
-<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">number</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
+<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3> +<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div> +<div class="tableblock"> +<table rules="all" +width="100%" +frame="border" +cellspacing="0" cellpadding="4"> +<col width="50%" /> +<col width="50%" /> +<tbody> +<tr> +<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">number</p></td> +<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">id</p></td> +<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td> </tr> <tr> <td align="left" valign="top"><p class="table">date</p></td> @@ -6444,19 +6444,19 @@ cellspacing="0" cellpadding="4"> </tr> <tr> <td align="left" valign="top"><p class="table">time</p></td> -<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">location</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">duration</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">depth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">location</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">duration</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">depth</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td> </tr> <tr> <td align="left" valign="top"><p class="table">divemaster</p></td> @@ -6476,7 +6476,7 @@ cellspacing="0" cellpadding="4"> </tr> <tr> <td align="left" valign="top"><p class="table">notes</p></td> -<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td> </tr> <tr> <td align="left" valign="top"><p class="table">rating</p></td> @@ -6540,110 +6540,110 @@ cellspacing="0" cellpadding="4"> </tr> </tbody> </table> -</div>
-<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as
-<em>CSS</em> values to provide a dynamically editable template. The exported data
-is shown in the following table:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">borderwidth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font_size</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">line_spacing</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color1</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color2</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color3</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color4</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color5</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color6</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code> border-width: {{ template_options.borderwidth }}px;</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code> border-width: 3px;</code></pre>
-</div></div>
-<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable
-contains a single member:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">grayscale</p></td>
-<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code> body {
- {{ print_options.grayscale }};
- }</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code> body {
- -webkit-filter: grayscale(100%);
- }</code></pre>
-</div></div>
+</div> +<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as +<em>CSS</em> values to provide a dynamically editable template. The exported data +is shown in the following table:</p></div> +<div class="tableblock"> +<table rules="all" +width="100%" +frame="border" +cellspacing="0" cellpadding="4"> +<col width="50%" /> +<col width="50%" /> +<tbody> +<tr> +<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">font</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">borderwidth</p></td> +<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">font_size</p></td> +<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">line_spacing</p></td> +<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color1</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color2</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color3</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color4</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color5</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">color6</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td> +</tr> +</tbody> +</table> +</div> +<div class="literalblock"> +<div class="title">template.html</div> +<div class="content"> +<pre><code> border-width: {{ template_options.borderwidth }}px;</code></pre> +</div></div> +<div class="literalblock"> +<div class="title">output.html</div> +<div class="content"> +<pre><code> border-width: 3px;</code></pre> +</div></div> +<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable +contains a single member:</p></div> +<div class="tableblock"> +<table rules="all" +width="100%" +frame="border" +cellspacing="0" cellpadding="4"> +<col width="50%" /> +<col width="50%" /> +<tbody> +<tr> +<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">grayscale</p></td> +<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td> +</tr> +</tbody> +</table> +</div> +<div class="literalblock"> +<div class="title">template.html</div> +<div class="content"> +<pre><code> body { + {{ print_options.grayscale }}; + }</code></pre> +</div></div> +<div class="literalblock"> +<div class="title">output.html</div> +<div class="content"> +<pre><code> body { + -webkit-filter: grayscale(100%); + }</code></pre> +</div></div> </div> <div class="sect2"> <h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3> @@ -6653,22 +6653,22 @@ following table should be added.</p></div> <div class="tableblock"> <table rules="all" width="100%" -frame="border"
-cellspacing="0" cellpadding="4">
-<col width="33%" />
-<col width="33%" />
-<col width="33%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
-</tr>
+frame="border" +cellspacing="0" cellpadding="4"> +<col width="33%" /> +<col width="33%" /> +<col width="33%" /> +<tbody> +<tr> +<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td> +<td align="left" valign="top"><p class="table">id</p></td> +<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td> +</tr> <tr> <td align="left" valign="top"><p class="table">diveProfile</p></td> <td align="left" valign="top"><p class="table">class</p></td> @@ -6681,18 +6681,18 @@ cellspacing="0" cellpadding="4"> in flow layout templates only (when data-numberofdives = 0)</p></td> </tr> </tbody> -</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Rendering dive profiles is not supported for flow layout templates (when
-data-numberofdives = 0).</td>
-</tr></table>
-</div>
-</div>
+</table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="./images/icons/important.png" alt="Important" /> +</td> +<td class="content">Rendering dive profiles is not supported for flow layout templates (when +data-numberofdives = 0).</td> +</tr></table> +</div> +</div> <div class="sect2"> <h3 id="_special_attributes">19.4. Special attributes</h3> <div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives @@ -6703,44 +6703,44 @@ rendering mode.</p></div> <div class="ulist"><ul> <li> <p> -render 6 dives per page:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code> <body data-numberofdives = 6></code></pre>
-</div></div>
-<div class="ulist"><ul>
-<li>
-<p>
-render as much dives as possible:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code> <body data-numberofdives = 0></code></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">All CSS units should be in relative lengths only, to support printing on any
-page size.</td>
-</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
-<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending
-with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em>
+render 6 dives per page: +</p> +</li> +</ul></div> +<div class="literalblock"> +<div class="content"> +<pre><code> <body data-numberofdives = 6></code></pre> +</div></div> +<div class="ulist"><ul> +<li> +<p> +render as much dives as possible: +</p> +</li> +</ul></div> +<div class="literalblock"> +<div class="content"> +<pre><code> <body data-numberofdives = 0></code></pre> +</div></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="./images/icons/important.png" alt="Important" /> +</td> +<td class="content">All CSS units should be in relative lengths only, to support printing on any +page size.</td> +</tr></table> +</div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3> +<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending +with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> calculates. Is <em>Subsurface</em> miscalculating?</p></div> <div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates gas consumption differently - and better - than you expect. In particular, @@ -6748,44 +6748,44 @@ it takes the incompressibility of the gas into account. Traditionally, gas consumption and SAC should be: <code>consumption = tank size x (start pressure - end pressure)</code></p></div> <div class="paragraph"><p>and that’s true for an ideal gas, and it’s what you get taught in dive -theory. But an "ideal gas" doesn’t actually exist, and real gases actually
-don’t compress linearly with pressure. Also, you are missing the fact that
-one atmosphere of pressure isn’t actually one bar. So the <strong>real</strong>
-calculation is:</p></div>
-<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
-<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
-It’s a combination of: "take compressibility into account" (which is a
-fairly small issue under 220 bar - you’ll see more differences when you do
-high-pressure tanks with 300bar) and "convert bar to atm" (which is the
-majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without
-the compressibility, your gas use is:</p></div>
-<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
-<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple
-calculation that ignored the difference between 1 bar and one ATM. The
-compressibility does show up above 200 bar, and takes that 1445 down about
-eight litres more, so you really did use only about 1437 l of air at surface
-pressure.</p></div>
-<div class="paragraph"><p>So be happy: your SAC really is better than your calculations indicated. Or
-be sad: your cylinder contains less air than you thought it did. And as
-mentioned, the "contains less air than you thought it did" really starts
-becoming much more noticeable at high pressure. A 400 bar really does not
-contain twice as much air as a 200 bar one. At lower pressures, air acts
-pretty much like an ideal gas.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3>
-<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth,
-divetime, SAC, etc). <em>Question</em>: Why do dive durations in my dive computer
-differ from that given by <em>Subsurface</em>?</p></div>
-<div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to
-trigger the "dive started") but then come back up and wait five minutes for
-your buddies, your dive computer may say that your dive is 50 minutes long -
-because you have fifty minutes worth of samples - but subsurface will say
-it’s 45 minutes - because you were actually diving for 45 minutes. It’s
-even more noticeable if you do things like divemastering the initial OW
-dives, when you may stay in the water for a long time, but spend most of it
-at the surface. And then you don’t want that to count as some kind of long
-dive”.</p></div>
+theory. But an "ideal gas" doesn’t actually exist, and real gases actually +don’t compress linearly with pressure. Also, you are missing the fact that +one atmosphere of pressure isn’t actually one bar. So the <strong>real</strong> +calculation is:</p></div> +<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div> +<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar". +It’s a combination of: "take compressibility into account" (which is a +fairly small issue under 220 bar - you’ll see more differences when you do +high-pressure tanks with 300bar) and "convert bar to atm" (which is the +majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without +the compressibility, your gas use is:</p></div> +<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div> +<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple +calculation that ignored the difference between 1 bar and one ATM. The +compressibility does show up above 200 bar, and takes that 1445 down about +eight litres more, so you really did use only about 1437 l of air at surface +pressure.</p></div> +<div class="paragraph"><p>So be happy: your SAC really is better than your calculations indicated. Or +be sad: your cylinder contains less air than you thought it did. And as +mentioned, the "contains less air than you thought it did" really starts +becoming much more noticeable at high pressure. A 400 bar really does not +contain twice as much air as a 200 bar one. At lower pressures, air acts +pretty much like an ideal gas.</p></div> +</div> +<div class="sect2"> +<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3> +<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, +divetime, SAC, etc). <em>Question</em>: Why do dive durations in my dive computer +differ from that given by <em>Subsurface</em>?</p></div> +<div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to +trigger the "dive started") but then come back up and wait five minutes for +your buddies, your dive computer may say that your dive is 50 minutes long - +because you have fifty minutes worth of samples - but subsurface will say +it’s 45 minutes - because you were actually diving for 45 minutes. It’s +even more noticeable if you do things like divemastering the initial OW +dives, when you may stay in the water for a long time, but spend most of it +at the surface. And then you don’t want that to count as some kind of long +dive”.</p></div> </div> <div class="sect2"> <h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3> @@ -6806,7 +6806,7 @@ salvaged after being overwritten by new dives.</p></div> </div> </div> </div> -</div>
+</div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> @@ -6814,4 +6814,4 @@ Last updated 2016-03-12 13:57:29 CET </div> </div> </body> -</html>
+</html> |