diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2015-09-01 14:28:46 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-01 06:11:36 -0700 |
| commit | b2fd98dc1b34fe0fcacb786b2955079075d41b68 (patch) | |
| tree | a0cd1fdacd34dfe8277a7a5ba2e7a44858ab895a /Documentation/user-manual_fr.html.git | |
| parent | a1c023bee08b65e9d9274a1b8214234a5edf61bf (diff) | |
| download | subsurface-b2fd98dc1b34fe0fcacb786b2955079075d41b68.tar.gz | |
Documentation: update french translation of user-manual
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
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 | 1349 |
1 files changed, 881 insertions, 468 deletions
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index fc905e352..b9f692c61 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -407,13 +407,13 @@ asciidoc.install(3); <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.4, Février 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
+<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, Septembre 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>
@@ -499,9 +499,9 @@ apparait. Cela est complètement optionnel et l’utilisateur contrôle quel informations sont envoyées ou non à l'équipe de développement de
<em>Subsurface</em>. Toutes les données que l’utilisateur choisit d’envoyer sont
extrêmement utiles et ne seront utilisées que pour les futures
-développements et modifications du logiciel pour coller au mieux aux besoins
-des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez
-sur l’option pour ne plus être sondé, cela devrait être la dernière
+développements et modifications du logiciel pour coller au mieux aux besoins +des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez +sur l’option pour ne plus être sondé, cela devrait être la dernière communication de ce type que vous recevrez. Cependant, si vos habitudes de plongées ou d’utilisation de Subsurface changent, vous pouvez envoyer un nouveau sondage en démarrant <em>Subsurface</em> avec l’option <em>--survey</em> sur la @@ -524,9 +524,9 @@ important pour manipuler un journal (carnet) de plongée.</p></div> <div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de l’utilisateur, sur une carte mondiale et centrée sur le site de la dernière plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div> -<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées
-sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des
-statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées +sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des +statistiques pour la plongée sélectionnée ou pour toutes les plongées mises en surbrillance.</p></div>
<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
@@ -577,64 +577,71 @@ principal. Toutes les données de plongées sont effacées pour que de nouvelles puissent être ajoutées. S’il existe des données non encore
enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il
faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_GetInformation">5. Storing dive information in the logbook</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Now that a new logbook was created, it is simple to add dive data to it.
-<em>Subsurface</em> allows several ways of adding dive data to a logbook, detailed
-in the following sections.</p></div>
-<div class="paragraph"><p>1) If the user has a handwritten divelog, a spreadsheet or another form of
- manually maintained divelog, dive data can be added to the logbook using one
- of these approaches:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Enter dive information by hand. This is useful if the diver did not
- use a dive computer and dives were recorded in a written logbook. See:
- <a href="#S_EnterData">Entering dive information by hand</a>
-</p>
-</li>
-<li>
-<p>
-Import dive log information that has been maintained either as a spreadsheet
- or as a CSV file. Refer to: <a href="#S_Appendix_D">APPENDIX D: Exporting a
- spreadsheet to CSV format</a> and to <a href="#S_ImportingCSVDives">Importing dives
- in CSV format</a>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>2) If one has dives recorded using a dive computer, the depth profile of the
- dive and a large amount of additional information can be accessed. These
- dives can be imported from:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-The divecomputer itself. See: <a href="#S_ImportDiveComputer">Importing new dive
- information from a Dive Computer</a> or
-</p>
-</li>
-<li>
-<p>
-Proprietary software distributed by manufacturers of dive computers. Refer
- to: <a href="#S_ImportingAlienDiveLogs">Importing dive information from other
- digital data sources or other data formats</a>.
-</p>
-</li>
-<li>
-<p>
-Import from spreadsheet or CSV files containing dive profiles.
- See: <a href="#S_ImportingCSVDives">Importing dives in CSV format from dive
- computers or other dive log software</a>
-</p>
-</li>
-</ul></div>
-<div class="sect2">
-<h3 id="S_EnterData">5.1. Entering dive information by hand</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,
+</div> +</div> +<div class="sect1"> +<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2> +<div class="sectionbody"> +<div class="paragraph"><p>Maintenant qu’un nouveau carnet de plongée a été créé, il est simple de lui +ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des +données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div> +<div class="paragraph"><p>1) Si l’utilisateur possède un carnet manuscrit, un tableur ou une autre forme + de + carnet maintenu manuellement, les données de plongée peuvent être ajoutées + au carnet en utilisant une des approches suivantes :</p></div> +<div class="ulist"><ul> +<li> +<p> +Entrer les informations de plongée à la main. Cela est utile si le plongeur + n’a pas + utilisé d’ordinateur de plongée et que les plongées sont inscrites dans un + carnet manuscrit. Voir <a href="#S_EnterData">Entrer les informations de plongée + à la main</a> +</p> +</li> +<li> +<p> +Importer les informations de plongée qui ont été maintenues soit dans un + 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>. +</p> +</li> +</ul></div> +<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée, + le profil de profondeur de la + plongée et de nombreuses informations supplémentaires peuvent être + utilisées. Ces plongées peuvent être importées à partir de :</p></div> +<div class="ulist"><ul> +<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> +</li> +<li> +<p> +Importer à partir d’un tableur ou de fichiers CSV contenant les profils de + plongées. + 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> +<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, duration, depth, the names of your dive buddy and of the dive master or dive
guide, and some remarks about the dive. <em>Subsurface</em> can store much more
information than this for each dive. In order to add a dive to a dive log,
@@ -921,13 +928,13 @@ clicked, the dive data are saved in the current logbook. If the <em>Cancel</em> button is clicked, the newly entered dive data are discarded. When exiting
<em>Subsurface</em>, the user will be prompted once more to save the logbook with
the new dive(s).</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportDiveComputer">5.2. Importing new dive information from a Dive Computer</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
+</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> +<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
capture this information and present it as part of the dive information,
@@ -1486,13 +1493,13 @@ button is clicked, then the newly entered dive data are deleted, although the dive profile obtained from the dive computer will be retained. When the
user exits <em>Subsurface</em> there is a final prompt to confirm that the new data
should be saved.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">5.3. Importing dive information from other digital data sources or other data formats</h3>
-<div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives
-were logged using other dive log software. This information does not need
-retyping because these dive logs can probably be imported into
+</div> +</div> +<div class="sect2"> +<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d’autres sources de données numériques ou d’autres formats de données</h3> +<div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives +were logged using other dive log software. This information does not need +retyping because these dive logs can probably be imported into <em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
log software. While some software is supported natively, for others the user
has to export the logbook(s) to an intermediate format so that they can then
@@ -1560,9 +1567,9 @@ JDiveLog Suunto Dive Manager (DM3 and DM4)
</p>
</li>
-<li>
-<p>
-CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
+<li> +<p> +CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs </p> </li> </ul></div> @@ -1572,15 +1579,23 @@ accessible through the Import dialogue are also supported, as explained below.</p></div> </div> <div class="sect3"> -<h4 id="_importing_from_heinrichs_weikamp_ostc_tools">5.3.2. Importing from Heinrichs Weikamp OSTC Tools</h4> +<h4 id="_importing_from_ostctools">5.3.2. Importing from OSTCTools</h4> <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 -select <em>All files</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> +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> +<div class="paragraph"><p>Actually, every H&W device supported by OSTCTools can be imported to +<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, +and probably although untested, Frog, OSTC2 and OSTC CR.</p></div> +<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a +useful set of tools for analysis and management of OSTC devices. This way, +only raw dive computer data will be achieved with the import to +<em>Subsurface</em>; user still have to manually complete the rest of data which +may be of some importance for him (buddies, equipment, notes, etc).</p></div> </div> <div class="sect3"> <h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4> @@ -1593,9 +1608,9 @@ information.</p></div> <li> <p> The dive log data from Mares Dive Organiser need to be exported to the - user’s desktop, using a <em>.sdf</em> file name extension. Refer to
- <a href="#Mares_Export">Appendix C</a> for more information.
-</p>
+ user’s desktop, using a <em>.sdf</em> file name extension. Refer to + <a href="#Mares_Export">Appendix C</a> for more information. +</p> </li>
<li>
<p>
@@ -1603,9 +1618,9 @@ Data should then be imported into <em>www.divelogs.de</em>. One needs to create user account in <em>www.divelogs.de</em>, log into that web site, then select
<em>Import Logbook → Dive Organiser</em> from the menu on the left hand side. The
instructions must be carefully followed to transfer the dive information (in
- <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.
-</p>
-</li>
+ <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>. +</p> +</li> <li> <p> Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the @@ -1632,7 +1647,7 @@ after which the imported dives appear in the <em>Subsurface</em> <strong>Dive Li </div> </div> <div class="sect3"> -<h4 id="S_ImportingCSVData">5.3.5. Importing data in CSV format</h4> +<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</h4> <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either as dive profiles (as in the case of the APD Inspiration and Evolution closed circuit rebreathers) or as dive metadata (in case the user keeps dive data @@ -1642,13 +1657,13 @@ packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro"> 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
-<em>Subsurface</em>.</p></div>
-<div class="sect4">
-<h5 id="S_ImportingCSVDives">Importing dives in CSV format from dive computers or other dive log software</h5>
-<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally
-organised into a single line that provides the headers (or <em>field names</em> or
-<em>column headings</em>) of the data columns, followed by the data, one record per
+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> +<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally +organised into a single line that provides the headers (or <em>field names</em> or +<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>
@@ -2374,9 +2389,9 @@ removes the photo both from the <em>Photos</em> tab as well as the dive profile. <h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If
such a drive can be mapped (almost always the case) the photos can be
-directly accessed by <em>Subsurface</em>. This facilitates the interaction between
-<em>Subsurface</em> and an external repository of photos. When associating a dive
-profile with photos from an external drive, the normal procedure of
+directly accessed by <em>Subsurface</em>. This facilitates the interaction between +<em>Subsurface</em> and an external repository of photos. When associating a dive +profile with photos from an external drive, the normal procedure of selection and synchronisation (see text above) is used. However, after the external drive has been disconnected, <em>Subsurface</em> cannot access these photos any more. If the display of photos is activated (using the toolbox @@ -2523,9 +2538,9 @@ steps:</p></div> <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>
+ 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>
@@ -2536,9 +2551,9 @@ steps:</p></div> currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2
to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive
profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the
- profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all
- 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.
+ profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all + 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> @@ -2612,9 +2627,9 @@ a) remove carbon dioxide from the gas that has been exhaled regulate the oxygen concentration to remain within safe diving limits. Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently -experimental and under active development. 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
+experimental and under active development. 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
same way that it imports dive log data from other digital databases.</td>
@@ -3315,9 +3330,9 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f 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>
+</p> +</li> +</ul></div> </div> </div> </div> @@ -3339,9 +3354,9 @@ a group of dives and then right-clicking.</p></div> <div class="sect3"> <h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4> <div class="imageblock" style="text-align:center;"> -<div class="content">
-<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
-</div>
+<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
@@ -3363,9 +3378,9 @@ only the dives for that site.</p></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
-sequence numbers) to recent dives (having the highest sequence numbers). The
+<h3 id="S_Renumber">7.2. Renumbering the dives</h3> +<div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low +sequence numbers) to recent dives (having the highest sequence numbers). The numbering of the dives is not always consistent. For instance, when non-recent dives are added to the dive list the numbering does not automatically follow on because of the dives that are more recent in @@ -3407,10 +3422,10 @@ panel. Here users can add or edit information about the date/time, the trip location and any other general comments about the trip as a whole (e.g. the dive company that was dived with, the general weather and surface conditions during the trip, etc.). After entering this information, users should -select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong> tab. The
-trip title in the <strong>Dive List</strong> panel should now reflect some of the edited
-information.</p></div>
-</div>
+select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong> tab. The +trip title in the <strong>Dive List</strong> panel should now reflect some of the edited +information.</p></div> +</div> <div class="sect3"> <h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4> <div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more @@ -3439,9 +3454,9 @@ right-clicking the top three dives. The resulting context menu allows the user to create a new trip by choosing the option <strong>Create new trip above</strong>. The top three dives are then grouped into a separate trip. The figures below shows the selection and 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">
+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>
@@ -3450,9 +3465,9 @@ completed action on the right (B):</p></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
-right-clicking them to bring up the context menu, and then selecting <strong>Delete
+<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 +right-clicking them to bring up the context menu, and then selecting <strong>Delete dive(s)</strong>. Typically this would apply to a case where a user wishes to delete workshop calibration dives of the dive computer or dives of extremely short duration.</p></div> @@ -3553,9 +3568,9 @@ those dives that have either one OR both of these tags.</p></div> <div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div> <div class="ulist"><ul> <li> -<p>
-Exporter les informations de plongée vers <em>Facebook</em>
-</p>
+<p> +Exporter les informations de plongée vers <em>Facebook</em> +</p> </li>
<li>
<p>
@@ -3574,9 +3589,9 @@ Facebook</em>, un écran de connexion est présenté (voir l’image <strong gauche, ci dessous). Entrez vos identifiant et mot de passe <em>Facebook</em>. Une
fois connecté à <em>Facebook</em>, le panneau de l’image <strong>B</strong> ci dessous est
présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la
-connexion <em>Facebook</em>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+connexion <em>Facebook</em>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" /> </div> </div> @@ -3615,9 +3630,9 @@ préférences Facebook.</p></div> </div> <div class="sect2"> <h3 id="S_Export_other">8.2. Export dive information to other destinations or formats</h3> -<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting
-<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
+<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting +<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;">
@@ -3749,9 +3764,9 @@ instance <em>www.divelogs.de</em>.</p></div> <div class="sectionbody">
<div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a
record of diving activities for one’s own pleasure, but it is important
-information required for admission to further training courses or
-(sometimes) even diving sites. The security of the dive log is therefore
-critical. In order to have a dive log that is resistant to failure of a home
+information required for admission to further training courses or +(sometimes) even diving sites. The security of the dive log is therefore +critical. In order to have a dive log that is resistant to failure of a home computer hard drive, loss or theft of equipment, the Cloud is an obvious solution. This also has the added benefit that one can access one’s dive log from anywhere in the world without having to carry it with oneself. For this @@ -3836,9 +3851,9 @@ Internet.</p></div> <div class="paragraph"><p>For instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that allows files on the Dropbox servers to be seen as a local folder on one’s desktop computer.</p></div> -<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
+<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" /> </div>
</div>
<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
@@ -3864,15 +3879,15 @@ in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div> same process could be used for the Cloud-based storage of dive logs.</p></div>
</div>
</div>
-<div class="sect1">
-<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple interface to print a whole dive log or only a
-few selected dives, including dive profiles and other contextual
-information.</p></div>
-<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
-<div class="ulist"><ul>
-<li>
+<div class="sect1"> +<h2 id="S_PrintDivelog">10. Printing a dive log</h2> +<div class="sectionbody"> +<div class="paragraph"><p><em>Subsurface</em> provides a simple interface to print a whole dive log or only a few selected dives. + Pre-installed templates or a custom written template can be used to choose where the data will + be fitted into the page.</p></div> +<div class="paragraph"><p>Before printing, two decisions are required:</p></div> +<div class="ulist"><ul> +<li> <p>
Should the whole dive log be printed or only part of it? If only part of the
dive log is required, then the user must select the required dives from the
@@ -3892,74 +3907,113 @@ this, user should select <em>File → Print</em> from the Main menu. The fol dialogue appears (see the image on the left [A], below).</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/PrintDiveLog.jpg" alt="FIGURE: Print dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>Under <em>Print type</em> users need to select one of three options:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Print the complete Dive List: to do this, <em>Table Print</em> should be selected.
-</p>
-</li>
-<li>
-<p>
-Print the selected dives (dive profiles and all other information) at 6
- dives per printed page: to do this, users should select <em>6 dives per page</em>.
-</p>
-</li>
-<li>
-<p>
-Print the selected dives (dive profiles and all other information) at 2
- dives per printed page: to do this, users should select <em>2 dives per page</em>.
-</p>
-</li>
-<li>
-<p>
-Print the selected dives (dive profiles and all other information) at 1 dive
- per printed page: to do this, users should select <em>1 dive per page</em>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Under <em>Print options</em> users need to select:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Printing only the dives that have been selected from the dive list prior to
- activating the print dialogue, achieved by checking the box <em>Print only
- selected dives</em>.
-</p>
-</li>
-<li>
-<p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The <em>Ordering</em> affects the layout of the page (or part of it) for each
-dive. The dive profile could be printed at the top of each dive, with the
-textual information underneath, or it could be printed with the textual
-information at the top with the dive profile underneath. Users should select
-the appropriate option in the print dialogue. See the image below which has
-a layout with text below the dive profile.</p></div>
-<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on
-the dialogue. After preview, changes to the options in the print dialogue
-can be made, resulting in a layout that fits personal taste.</p></div>
-<div class="paragraph"><p>Next, select the <em>Print</em> button in the dialogue. This activates the regular
-print dialogue used by the user operating system (image [<strong>B</strong>] in the middle,
-above), allowing them to choose a printer and to set its properties (image
-[<strong>C</strong>] on the right, above). It is important to set the print resolution of
-the printer to an appropriate value by changing the printer
+<img src="images/PrintDiveLog.jpg" alt="FIGURE: Print dialogue" /> +</div> +</div> +<div class="paragraph"><p>Under <em>Print type</em> users need to select one of two options:</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Dive list</em> print: print dives from the list with profiles and other + information. +</p> +</li> +<li> +<p> +<em>Statistics</em> print: print yearly statistics of the dives. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Under <em>Print options</em> users need to select:</p></div> +<div class="ulist"><ul> +<li> +<p> +Printing only the dives that have been selected from the dive list prior to + activating the print dialogue, achieved by checking the box <em>Print only + selected dives</em>. +</p> +</li> +<li> +<p> +Printing in colour, achieved by checking the box with <em>Print in colour</em>. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Under <em>Template</em> users can select:</p></div> +<div class="ulist"><ul> +<li> +<p> +A template to be used as the page layout. +</p> +</li> +<li> +<p> +<em>Delete</em> a template from the template list +</p> +</li> +<li> +<p> +<em>Import</em> a new template to the template list +</p> +</li> +<li> +<p> +<em>Export</em> a template from the template list +</p> +</li> +<li> +<p> +<em>Edit</em> a template (choose colors, fonts, font-type) +</p> +</li> +</ul></div> +<div class="paragraph"><p>When editing a template the following options are available:</p></div> +<div class="ulist"><ul> +<li> +<p> +<em>Style</em>: edit font type, size, choose color palette; this will not affect + the template HTML code +</p> +</li> +<li> +<p> +<em>Template</em>: edit the template HTML code; by saving, the "Custom" template in + the template list will be replaced +</p> +</li> +<li> +<p> +<em>Colors</em>: edit the current color palette; the new color palette will + overwrite the "Custom" color palette +</p> +</li> +</ul></div> +<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on +the dialogue. After preview, changes to the options in the print dialogue +can be made, resulting in a layout that fits personal taste.</p></div> +<div class="paragraph"><p>Next, select the <em>Print</em> button in the dialogue. This activates the regular +print dialogue used by the user operating system (image [<strong>B</strong>] in the middle, +above), allowing them to choose a printer and to set its properties (image +[<strong>C</strong>] on the right, above). It is important to set the print resolution of +the printer to an appropriate value by changing the printer properties. Finally, one can 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="sect1">
+<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" /> +</div> +</div> +<div class="sect2"> +<h3 id="_write_a_custom_printing_template_advanced">10.1. Write a custom printing template (advanced)</h3> +<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized +printouts. Subsurface uses HTML templates with Grantlee as the printing +backend.</p></div> +<div class="paragraph"><p>See <a href="#_appendix_f_write_a_custom_printing_template">APPENDIX F</a> for +information on how to write your own template.</p></div> +</div> +</div> +</div> +<div class="sect1"> <h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
<div class="sectionbody">
<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
@@ -4128,9 +4182,9 @@ the dive profile: dive computer can calculate ceilings during a dive.
</p>
</li>
-<li>
-<p>
-<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<li> +<p> +<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list. </p> </li> <li> @@ -4150,9 +4204,9 @@ the dive profile: </li> <li> <p> -Gradient Factors:* Here users can 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.
+Gradient Factors:* Here users can 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. Gradient factors add conservatism to the nitrogen exposure during a dive, in a
similar way that many dive computers have a conservatism setting. The lower
the value of a gradient factor, the more conservative the calculations are with
@@ -4255,9 +4309,9 @@ Service Provider (ISP) used. One’s ISP should provide the appropriate information. If a proxy server is used for Internet access, the appropriate
information needs to be provided here. 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 also needs to be
-provided so that <em>Subsurface</em> can automatically pass through the proxy
+the appropriate port number should be provided. If the proxy server uses +authentication, the appropriate userID and password also needs to be +provided so that <em>Subsurface</em> can automatically pass through the proxy server to access the Internet.</p></div> </div> <div class="sect2"> @@ -4278,9 +4332,9 @@ plongée vers Facebook</a> pour plus d’informations.</p></div> </div> </div> </div> -<div class="sect1">
-<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>
-<div class="sectionbody">
+<div class="sect1"> +<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2> +<div class="sectionbody"> <div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by
selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of
nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the
@@ -4345,9 +4399,9 @@ and Notes.</p></div> <div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of
the 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
+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;"> @@ -4372,9 +4426,9 @@ Open Circuit (the default) </li> <li> <p> -CCR
-</p>
-</li>
+CCR +</p> +</li> <li> <p> pSCR @@ -4540,9 +4594,9 @@ used without changing the original values in the <em>Preferences</em>. Gradient A very low GFLow value brings about decompression stops early on during the dive. ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>. For more information external to this manual see:</p></div> -<div class="ulist"><ul>
-<li>
-<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>
@@ -4642,9 +4696,9 @@ appear in 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
-diveplan</em> is requested, a detailed sentence-level explanation of the dive
+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 +diveplan</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> @@ -4687,10 +4741,10 @@ cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</ 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 means the diver bails out to open circuit mode for that segment. The decompression is always calculated -using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
-CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, 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>
+using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a +CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression +algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, 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" /> @@ -4709,9 +4763,9 @@ will open the selected dive plan within the dive planner, allowing changes to be made and saved as usual.</p></div> <div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned 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>
+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>
<div class="sect2">
<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
@@ -4792,9 +4846,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
formats.
</p>
-</li>
-<li>
-<p>
+</li> +<li> +<p> <a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement ouvert. </p> @@ -4815,9 +4869,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <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>
+ configuration d’un ordinateur de plongée. +</p> +</li> <li>
<p>
<em>Quitter</em> - Quitter <em>Subsurface</em>.
@@ -4858,9 +4912,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </div>
<div class="sect2">
<h3 id="_journal_log">14.3. Journal (log)</h3>
-<div class="ulist"><ul>
-<li>
-<p>
+<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> @@ -4887,9 +4941,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <p> <a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En sélectionnant cette option, vous pouvez copier les informations de plusieurs - champs d’un journal de plongée vers le presse-papier.
-</p>
-</li>
+ champs d’un journal de plongée vers le presse-papier. +</p> +</li> <li>
<p>
<em>Coller les composants de la plongée</em> - Colle, dans les plongées
@@ -5007,16 +5061,39 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </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">
+</div> +</div> +<div class="sect1"> +<h2 id="_mobile_version">15. Mobile Version</h2> +<div class="sectionbody"> +<div class="paragraph"><p><em>Subsurface</em> has a mobile version, which can be used to view the dives +stored in the user’s cloud account.</p></div> +<div class="sect2"> +<h3 id="_how_to_use_the_mobile_version">15.1. How to use the mobile version</h3> +<div class="paragraph"><p>When you first open the mobile app, you will have to log into your cloud +account. To do this, click on the menu icon on the upper right, then click +on preferences. Enter your cloud email and password, then click on save.</p></div> +<div class="paragraph"><p>To load dives the first time, click on the menu icon, and then click on +<em>Load Dives</em>. This will fetch the dive list from the cloud storage onto your +device. On subsequent runs, the divelist will be loaded automatically when +you open the app.</p></div> +<div class="paragraph"><p>To view dive details, tap on any dive in the dive list. This will open the +dive details window, which shows the dive profile and below it, the dive +details. Any of the dive details can be changed.</p></div> +<div class="paragraph"><p>To save changes made to the dive details, click on the back icon, then from +the menu select <em>Save Changes</em>. This will save your changes to the cloud +storage.</p></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">16. 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">16.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>
<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour
@@ -5048,13 +5125,13 @@ 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">
+de documents et logiciels Silicon Labs</a>.</p></div> +</div> +<div class="sect2"> +<h3 id="S_HowFindDeviceName">16.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>
<td class="content">Lorsqu’un utilisateur connecte un ordinateur de plongée en utilisant l’USB,
@@ -5137,13 +5214,13 @@ parmi les différents IDs. Sous certaines circonstances, les modifications ne prennent effet qu’après une déconnexionpuis reconnexion sur l’ordinateur (sous Ubuntu, par exemple).
Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
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. Setting up bluetooth enabled devices</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+vous devriez pouvoir importer vos plongées.</p></div> +</div> +<div class="sect2"> +<h3 id="S_HowFindBluetoothDeviceName">16.3. 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
@@ -5160,9 +5237,9 @@ these steps:</td> </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, select <em>Dive Log → Upload
-Log</em> and wait for the <em>Wait PC</em> message.</p></div>
-<div class="ulist"><ul>
+guide. When using a Shearwater Predator/Petrel, 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> @@ -5170,7 +5247,7 @@ Log</em> and wait for the <em>Wait PC</em> message.</p></div> </li> </ul></div> <div class="sect3"> -<h4 id="_sur_windows">15.3.1. Sur Windows :</h4> +<h4 id="_sur_windows">16.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 @@ -5184,7 +5261,7 @@ contain this COM port already. If not, enter it manually.</p></div> 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> +<h4 id="_sur_macos">16.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 @@ -5193,7 +5270,7 @@ be needed once for initial setup.</p></div> Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div> </div> <div class="sect3"> -<h4 id="_sur_linux">15.3.3. Sur Linux</h4> +<h4 id="_sur_linux">16.3.3. Sur Linux</h4> <div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer. On most common distributions this should be true out of the box and pairing should be straight forward. For instance, Gnome3 shows a Bluetooth icon on the right @@ -5416,13 +5493,13 @@ upload mode countdown is still running, go to_Subsurface_, select </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> +<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">17. 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">
+<div class="sect2"> +<h3 id="S_ImportUemis">17.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
@@ -5450,13 +5527,13 @@ displays an error that the dive computer ran out of space the solution is straight forward. Disconnect the SDA, turn it off and on again, and
reconnect it. You can now retry (or start a new download session) and the
download will continue where it stopped previously. One 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">
+more than once, depending on how many dives are stored on the dive computer.</p></div> +</div> +<div class="sect2"> +<h3 id="S_ImportingGalileo">17.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
@@ -5467,9 +5544,9 @@ 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>
+<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> <div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive @@ -5484,11 +5561,11 @@ ScubaPro SmartTrak software.</p></div> for OSX 10.6 or higher.</p></div> </div> <div class="sect2"> -<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3> +<h3 id="S_ImportingDR5">17.3. Importing from Heinrichs Weikamp DR5</h3> <div class="admonitionblock"> -<table><tr>
-<td class="icon">
-<img src="images/icons/HW_DR5.jpg" alt="Note" />
+<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.
@@ -5499,13 +5576,13 @@ in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note t 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">
+</div> +</div> +<div class="sect2"> +<h3 id="S_ImportingXDeep">17.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"
@@ -5518,13 +5595,13 @@ in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay 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_using_bluetooth">16.5. Importing from Shearwater Predator using Bluetooth</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+</div> +</div> +<div class="sect2"> +<h3 id="_importing_from_shearwater_predator_using_bluetooth">17.5. Importing from Shearwater Predator using Bluetooth</h3> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/icons/predator.jpg" alt="Note" />
</td>
<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then
@@ -5552,13 +5629,13 @@ switch to different Bluetooth drivers for the same hardware switch off WiFi while using Bluetooth
</p>
</li>
-</ul></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">
+</ul></div> +</div> +<div class="sect2"> +<h3 id="S_PoseidonMkVI">17.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
@@ -5590,13 +5667,13 @@ Redbook format dive log (file with .cvsr extension). This is a compressed </li>
</ul></div>
<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log
-information.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_importing_from_apd_inspiration_ccr">16.7. Importing from APD Inspiration CCR</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+information.</p></div> +</div> +<div class="sect2"> +<h3 id="_importing_from_apd_inspiration_ccr">17.7. Importing from APD Inspiration 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
@@ -5668,13 +5745,13 @@ Ensure the other settings for the ADP dive log are appropriate, then select </ul></div>
<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>.</p></div>
</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,
+</div> +</div> +<div class="sect1"> +<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">18. 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>
@@ -5692,13 +5769,13 @@ Import the accessible dive log data into <em>Subsurface</em>. </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">
+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">18.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.
@@ -5726,9 +5803,9 @@ 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:
+<li> +<p> +Within the list of dives, select the dives you would like to import later: </p> <div class="ulist"><ul> <li> @@ -5749,9 +5826,9 @@ To select all dives: Select the first dive, hold down shift and select the 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
+<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>
@@ -5862,13 +5939,13 @@ Click <em>Save</em> 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">
+</ol></div> +</div> +<div class="sect2"> +<h3 id="_exporting_from_atomic_logbook">18.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
@@ -5877,13 +5954,13 @@ 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">
+</div> +</div> +<div class="sect2"> +<h3 id="_exporting_from_mares_dive_organiser_v2_1">18.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>
<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
@@ -5918,60 +5995,74 @@ Extract the <em>.sdf</em> file from the zipped folder to your Desktop. 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</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/divingloglogo.jpg" alt="Note" />
-</td>
-<td class="content">Unfortunately DivingLog XML files give us no indication on the preferences
-set on one’s system. So in order for <em>Subsurface</em> to be able to successfully
-import XML files from DivingLog one first needs to ensure that DivingLog is
-configured to use the Metric system (one can easily change this within
-Diving Log by selecting <em>File → Preferences → Units and Language</em> by
-clicking the <em>Metric</em> button). Then do the following:</td>
-</tr></table>
-</div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-In DivingLog open the <em>File → Export → XML</em> menu
-</p>
-</li>
-<li>
-<p>
-Select the dives to export
-</p>
-</li>
-<li>
-<p>
-Click on the export button and select the filename
-</p>
-</li>
-</ol></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_Appendix_D">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Many divers keep a diving log in some form of a digital file, commonly a
-spreadsheet with various fields of information. These logs can be easily
-imported into <em>Subsurface</em> after the spreadsheet is converted in a .CSV
-file. This section explains the procedure to convert a diving logbook
-stored in a spreadsheet to a .CSV file that will later be imported from
-<em>Subsurface</em>. Creating a .CSV is a straightforward task, although the
-procedure is somewhat different according to which spreadsheet program is
-used.</p></div>
-<div class="paragraph"><p>The first step is to organize the diving data in the spreadsheet, so that
-the first row contains the names (or titles) of each column and the
-information for each dive is stored in a single row. <em>Subsurface</em> supports
-many data items (Dive #, Date, Time, Duration, Location, GPS, Max Depth, -Mean Depth, Buddy, Notes, Weight and Tags). The user can organize dive data -following a few simple rules:</p></div> +</ol></div> +</div> +<div class="sect2"> +<h3 id="S_ImportingDivingLog">18.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 +the details, and we would lack e.g. gas switches and information of what +units are used. With database import, all this information is included and +readily available for us.</td> +</tr></table> +</div> +<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div> +<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> +</li> +</ol></div> +<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the +dives are automatically converted to our own format. Last step to do is save +the log file in Subsurface.</p></div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="S_Appendix_D">19. ANNEXE D : Exporter un tableur vers le format CSV</h2> +<div class="sectionbody"> +<div class="paragraph"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier +numérique, souvent un tableur avec différents champs et informations. Ces +données peuvent facilement être importées dans <em>Subsurface</em> après que le +tableur a été converti en fichier CSV. Cette section explique la procedure +pour convertir un carnet de plongée enregistrée sous forme de tableur vers +un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un +fichier CSV est une tache simple malgré que la procédure soit différente +selon le tableur utilisé.</p></div> +<div class="paragraph"><p>La première étape est d’organiser les données de plongées dans le tableur +pour que la première ligne contienne le nom (ou le titre) de chaque colonne +et que les informations de chaque plongée soient contenues sur une seule +ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time, +Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et +Tags). L’utilisateur peut organiser les données de plongées selon quelques +règles simples :</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> @@ -5985,8 +6076,8 @@ Durée : le format est minutes:secondes. </li> <li> <p> -Unit system: only one unit system should be used (i.e., no mixture between - imperial and metric units) +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> @@ -6003,16 +6094,16 @@ Position GPS : vous devez utiliser les degrés décimaux, par exemple : </li> </ol></div> <div class="sect2"> -<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3> +<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">19.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3> <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 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 →
@@ -6033,13 +6124,13 @@ then select <em>OK</em>.</p></div> </div>
<div class="paragraph"><p>One can double check the .CSV file by opening it with a text editor, and
then import the dive data as explained on the section
-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_microsoft_em_excel_em">18.2. Microsoft <em>Excel</em></h3>
-<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not
-accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft
-Control Panel</em>. After changing the separator character, all software on the
+<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> +</div> +<div class="sect2"> +<h3 id="_microsoft_em_excel_em">19.2. Microsoft <em>Excel</em></h3> +<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not +accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft +Control Panel</em>. After changing the separator character, all software on the Windows machine use the new character as a separator. One can change the
character back to the default character by following the same procedure,
outlined below.</p></div>
@@ -6103,16 +6194,16 @@ that was selected. One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section
<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_e_faqs">19. APPENDIX E: FAQs.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">19.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> +</div> +<div class="sect1"> +<h2 id="_appendix_e_faqs">20. APPENDIX E: FAQs.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">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,
it takes the incompressibility of the gas into account. Traditionally, Gas
@@ -6141,30 +6232,352 @@ 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">19.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>
+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
+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> +<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even +though my dive computer’s manual states that it records history of e.g. 999 +dives.</p></div> +<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log. The +history only keeps track of the total number of dives and total amount of +time spent below surface. The logs, on the other hand, store the dive +profile, but they have limited amount of memory to do so. The exact amount +of dive profiles that can be stored on the device depend on sample interval +and duration of the dives. Once the memory is full the oldest dives get +overwritten with new dives. Thus we are only able to download the last 13, +30 or 199 dives.</p></div> +<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before +they were overwritten, there is a high change that Subsurface can import +these. However, if the logs are only on your dive computer, they cannot be +salvaged after being over written by new dives.</p></div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_appendix_f_write_a_custom_printing_template">21. APPENDIX F: Write a custom printing template</h2> +<div class="sectionbody"> +<div class="paragraph"><p><em>Subsurface</em> provides a customizable printing support which is based on +templates that are transformed by the <em>Grantlee</em> backend to correct <em>HTML</em> +syntax, The <em>HTML</em> output is then rendered by <em>Subsurface</em>.</p></div> +<div class="paragraph"><p>To write a custom template the following elements must exist so that the +template will be correctly handled and rendered.</p></div> +<div class="sect2"> +<h3 id="_main_dive_loop">21.1. Main dive loop</h3> +<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> +backend. It is possible to iterate over the list as follows:</p></div> +<div class="literalblock"> +<div class="title">template.html</div> +<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> + <h1> 2 </h1> + <h1> 3 </h1></code></pre> +</div></div> +<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found +<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div> +</div> +<div class="sect2"> +<h3 id="_grantlee_exported_variables">21.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> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td> +</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> +</tr> +<tr> +<td align="left" valign="top"><p class="table">divemaster</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">buddy</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">airTemp</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">waterTemp</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td> +</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> +</tr> +<tr> +<td align="left" valign="top"><p class="table">rating</p></td> +<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">sac</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">tags</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">gas</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td> +</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="sect2"> +<h3 id="_defined_css_selectors">21.3. Defined CSS selectors</h3> +<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special +<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors +in the 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> +<tr> +<td align="left" valign="top"><p class="table">diveProfile</p></td> +<td align="left" valign="top"><p class="table">class</p></td> +<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">dontbreak</p></td> +<td align="left" valign="top"><p class="table">class</p></td> +<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used +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> +<div class="sect2"> +<h3 id="_special_attributes">21.4. Special attributes</h3> +<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives +in each page or make <em>Subsurface</em> try to fit as much dives as possible into +one page (<em>flow</em> rendering).</p></div> +<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the +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> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-07-20 18:27:03 CEST +Last updated 2015-09-01 14:25:48 CEST </div> </div> </body> |