diff options
author | Guillaume GARDET <guillaume.gardet@free.fr> | 2015-09-09 14:54:50 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-09 14:07:09 -0700 |
commit | fea2b52179534c7d93b541e5b74ad7cb696c92b1 (patch) | |
tree | 1b8657a9742099d43690f7a3519cec5ad66f9739 /Documentation/user-manual_fr.html.git | |
parent | 813f6f502ff3edbb6dabf8d88f5bff84745c193c (diff) | |
download | subsurface-fea2b52179534c7d93b541e5b74ad7cb696c92b1.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 | 1309 |
1 files changed, 568 insertions, 741 deletions
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index cb9b70799..4a4c543f5 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -401,9 +401,9 @@ asciidoc.install(3); <body class="article">
<div id="header">
</div>
-<div id="content">
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+<div id="content"> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/Subsurface4Banner.jpg" alt="Banner" /> </div> </div> @@ -417,9 +417,9 @@ 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
+<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>
@@ -493,9 +493,9 @@ pour rechercher n’importe quel terme dans le manuel.</p></div> <div class="sectionbody">
<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d’une manière qui serve ses
utilisateurs de la meilleur manière qu’il soit, il est important d’avoir des
-informations sur les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir
-utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
-apparait. Cela est complètement optionnel et l’utilisateur contrôle quelles
+informations sur les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir +utilisé le logiciel pendant une semaine environ, une fenêtre de sondage +apparait. Cela est complètement optionnel et l’utilisateur contrôle quelles 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 @@ -530,9 +530,9 @@ 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> -<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
-taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
-séparateurs, pour qu’au prochain lancement <em>Subsurface</em> utilise ces
+<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la +taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces +séparateurs, pour qu’au prochain lancement <em>Subsurface</em> utilise ces positions.</p></div>
<div class="paragraph"><p>Si une plongée est sélectionnée dans la <strong>liste des plongées</strong>, l’emplacement
de la plongée, les informations détaillées et le profil de la <em>plongée
@@ -542,13 +542,13 @@ surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>t plongées mises en surbrillances</em> sont affichées dans l’onglet <strong>Stats</strong> du
panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
durées, les températures de l’eau et le SAC (air consommé); temps total et
-nombre de plongées sélectionnées).</p></div>
-<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
-<div class="content">
-<img src="images/main_window_f20.jpg" alt="The Main Window" />
-</div>
-</div>
-<div class="paragraph"><p>L’utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
+nombre de plongées sélectionnées).</p></div> +<div class="imageblock" id="S_ViewPanels" style="text-align:center;"> +<div class="content"> +<img src="images/main_window_f22.jpg" alt="The Main Window" /> +</div> +</div> +<div class="paragraph"><p>L’utilisateur peut déterminer si lesquels des quatre panneaux sont affichés en sélectionnant l’option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
permet plusieurs choix d’affichage :</p></div>
<div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div>
@@ -571,9 +571,9 @@ carnet de plongée sera détaillée.</p></div> </div>
<div class="sect1">
<h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Sélectionner <em>Fichier → Nouveau carnet de plongée</em> à partir du menu
-principal. Toutes les données de plongées sont effacées pour que de
+<div class="sectionbody"> +<div class="paragraph"><p>Sélectionner <em>Fichier → Nouveau carnet de plongée</em> à partir du menu +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> @@ -645,229 +645,38 @@ 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, -select <em>Log → Add Dive</em> from the Main Menu. The program then shows three
-panels to enter information for a dive: two tabs in the <strong>Info</strong> panel
-(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays
-a graphical profile of each dive. These panels are respectively marked
-<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will
-now be explained for data entry.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />
-</div>
-</div>
-<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters
-<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
-<em>Notes</em> 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_f20.jpg" alt="Blue edit bar" />
-</div>
-</div>
-<div class="paragraph"><p>The <em>Save</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>Save</em> button, a local copy of the information for this
-specific dive is saved in memory. When one closes Subsurface, the program
-will ask again, this time whether the complete dive log should be saved on
-disk or not.</p></div>
-<div class="sect3">
-<h4 id="_notes">5.1.1. Notes</h4>
-<div class="paragraph"><p>This panel contains the date, time and place information for a particular
-dive, environmental conditions, co-divers and buddies, as well as some
-descriptive information. If one clicks on the <strong>Notes</strong> tab, the following
-fields are visible:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Notes tab" />
-</div>
-</div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking the
-date, a calendar is displayed from which one can choose the correct
-date. Press ESC to escape from the calendar. The time values (hour and
-minutes) can also be edited directly by clicking on each of them in the text
-box and by overtyping the information displayed. The default date is the
-present date and the default time is an hour in advance of the present time.</p></div>
-<div class="paragraph"><p><strong>Air and water temperatures</strong>: the air and water temperatures during the
-dive can be typed directly on the fields to the right of the Start time.
-Temperature units are not needed, as they will be automatically supplied by
-<em>Subsurface</em>. Only the numerical value must be
-typed by the user (the units selected in the <em>Preferences</em>
-will determine whether metric or imperial units are used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
-Balaton,
-Hungary". Auto completion of location names will make this easier if one
-frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-One can find the coordinates on the world map in the bottom right hand part
- of the Subsurface window. The map displays a green bar indicating "No
- location data - Move the map and double-click to set the dive
- location". Upon a double-click at the appropriate place, the green bar
- disappears and the coordinates are stored.
-</p>
-</li>
-<li>
-<p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
- user has an Android or iPhone device with GPS and if the coordinates of the
- dive site were stored using that device. <a href="#S_Companion">Click here for
- more information</a>
-</p>
-</li>
-<li>
-<p>
-The coordinates can be entered by hand if they are known, using one of four
- formats with latitude followed by longitude:
-</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
-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.</p></div> -<div class="paragraph"><p>Some keyboards don’t have the degree sign (°). It can be replaced by a d -like that: N30d W20d.</p></div> -<div class="paragraph"><p>Note that GPS coordinates of a dive site are linked to the Location name - -so adding coordinates to dives that do not have a location description will -cause unexpected behaviour (Subsurface will think that all of these dives -have the same location and try to keep their GPS coordinates the same).</p></div> -<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive -performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives), -Freedive (dive without SCUBA equipment), CCR (Closed-circuit -rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive can be
-entered here.
-Again, this field offers auto completion based on the list of dive masters in
-the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field one can enter the name(s) of the buddy / buddies
-(separated by commas) who accompanied the user on the dive. Auto completion
-is offered based on the list of buddies in the current logbook.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: The type of diving suit used for the dive can be entered here.
-As with the other items, auto completion of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed may
-be entered here (separated by commas). Examples of common tags are boat, drift,
-training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion is once again offered.
-For instance, if <code>cav</code> was typed, then the tags <strong>cave</strong> and <strong>cavern</strong> are
-shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information can be typed here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
-tabs in the info panel and in the dive profile panel, so there’s no need to
-use them until ALL other information has been added. Here is an example of a
-completed Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipment">5.1.2. Equipment</h4>
-<div class="paragraph"><p>The Equipment tab allows the user to enter information about the type of
-cylinder and gas used, as well as the weights used for a dive. This is a
-highly interactive part of <em>Subsurface</em> and the information on cylinders and
-gases (entered here) affects the behaviour of the dive profile (top
-right-hand panel).</p></div>
-<div class="paragraph" id="S_CylinderData"><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/Gas_dialogue1_f20.jpg" alt="FIGURE:Initial cylinder dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The + button at the top right allows the user to add more cylinders for this
-dive. The dark dustbin icon on the left allows one to delete information
-for a particular cylinder. Note that it is not possible to delete a cylinder
-if it is used during the dive. One cylinder is implicitly used in the dive,
-even without a gas change event. Thus the first cylinder cannot be deleted
-until another cylinder is created.</p></div>
-<div class="paragraph"><p>Start by selecting a cylinder type on the left-hand side of the table. To
-select a cylinder, click in the <strong>Type</strong> box. This brings up a button that
-can be used to display a dropdown list of cylinders:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="FIGURE:The cylinder drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can be used to select the cylinder type used for the dive
-or the user may 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 (<strong>WorkPress</strong>) will automatically be shown in the
-dialogue. If a cylinder is not shown in the dropdown list, type the name and
-description of that cylinder into the <strong>Type</strong> field.</p></div>
-<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the gas used
-during the dive. The unit of pressure (metric/imperial) corresponds to the
-setting in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, type in the gas mixture used in the <strong>O2%</strong> field. If air was used, a
-value of 21% can be entered on this field, or it might be left blank. If
-nitrox or trimix were used, their percentages of oxygen and/or helium must
-be specified. Any inappropriate fields should be left empty. After typing
-the information for the cylinder, press <em>ENTER</em> on the keyboard or click
-outside the cell that contains the cursor. Information for any additional
-cylinders can be added by using the + button at the top right
-hand. Following is an example of a complete description for a dive made
-using two cylinders (air and EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used during a dive can be entered
-using a dialogue very similar to that for the cylinder information. If the user
-clicks 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>If one then clicks on the <strong>Type</strong> 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>The drop-down list can then be used to select the type of weight system or
-the user may start typing in the box which shows the available options for
-the entered characters. In the <strong>Weight</strong> field, the weight used during the
-dive must be typed. After typing the information for the weight system the
-user must either press <em>ENTER</em> on the keyboard or click outside the cell
-that contains the cursor. It is possible to enter information for more than
-one weight system by adding an additional system using the + button on the
-top right hand. Weight systems can be deleted using the dustbin icon on the
-left hand. Here is an example of information for a dive with two types of
-weights: integrated and 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 class="paragraph"><p>There’s NO need to click the <em>Save</em> button before the dive profile has been
-completed.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.3. Creating a Dive Profile</h4>
-<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
-function of time) is indicated in the panel on the top right hand of the
-<em>Subsurface</em> window. When a dive is manually added to a logbook,
+select <em>Log → Add Dive</em> from the Main Menu. The program then shows three +panels to enter information for a dive: two tabs in the <strong>Info</strong> panel +(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays +a graphical profile of each dive. These panels are respectively marked +<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will +now be explained for data entry.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" /> +</div> +</div> +<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters +<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the +<em>Notes</em> 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 +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 +information for this specific dive is saved in memory. When one closes +Subsurface, the program will ask again, this time whether the complete dive +log should be saved on disk or not.</p></div> +<div class="sect3"> +<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4> +<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a +function of time) is indicated in the panel on the top right hand of the +<em>Subsurface</em> window. When a dive is manually added to a logbook, <em>Subsurface</em> presents a default dive profile that needs to be modified to
best represent the dive being described:</p></div>
<div class="imageblock" style="text-align:center;">
@@ -899,34 +708,21 @@ indicated along the line segments of the dive profile. This defaults to the first gas mixture specified in the <strong>Equipment</strong> tab, which was air in the
case of the profile illustrated above. The gas mixtures of segments of the
dive profile can be edited. This is done by right-clicking on the particular
-waypoint and selecting the appropriate gas from the context menu. Changing
-the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of
-that waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab
-appear in the context menu.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
-</div>
-</div>
-<div class="paragraph"><p>Below is the profile of a dive to 25 m for 30 min and with a switch from air
-to EAN50 at the end of the duration at 20m. In this case the first cylinder
-in the <strong>Equipment</strong> tab contained air and the second cylinder contained
-EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Completed dive profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab, the <strong>Equipment</strong> tab as well as
-the <strong>Dive Profile</strong> can now be saved in the user’s logbook by using the two
-buttons on the top right hand of the Notes tab. If the <em>Save</em> button is
-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> +waypoint and selecting the appropriate gas from the context menu. Changing +the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of +that waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab +appear in the context menu. Below is the profile of a dive to 25 m for 30 +min and with a switch from air to EAN50 at the end of the duration at 20m.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" /> +</div> +</div> +<div class="paragraph"><p>With the profile having been defined, more details must be added in order to +have a fuller record of the dive. To do this, the <strong>Notes</strong> and the +<strong>Equipment</strong> tabs on the top left hand of the <em>Subsurface</em> window should be +used. Click on <a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these +tabs.</p></div> </div> </div> <div class="sect2"> @@ -937,9 +733,9 @@ the new dive(s).</p></div> 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, -using dive information from a wide range of dive computers. The latest list
-of supported dive computers can be found at:
-<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
+using dive information from a wide range of dive 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>
@@ -1201,60 +997,82 @@ device instead of the model name, allowing easy identification of devices.</p></ <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
computer is not complete and more details must be added in order to have a
fuller record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs
-on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_notes_2">5.2.4. Notes</h4>
-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are
-usually shown as obtained from the dive computer, but the user needs to add
-additional information by hand in order to have a more complete dive
-record. In a few cases, (e.g. APD rebreathers) one also has to provide the
-date and time of the dive. If the contents of this tab is changed or edited
-in any way, the message in a blue box at the top of the panel indicates that
-the dive is being edited. If one clicks on the <strong>Notes</strong> tab, the following
-fields are visible:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Notes tab" />
-</div>
-</div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking the
-date, a calendar is displayed from which one can choose the correct
-date. Press ESC to close the calendar. The time values (hour and minutes)
-can also be edited directly by clicking on each of them in the text box and
-by overtyping the information displayed.</p></div>
-<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
-in these fields to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore contain information obtained from the dive computer.
+on the top left hand of the <em>Subsurface</em> window should be used.</p></div> +</div> +<div class="sect3"> +<h4 id="S_Notes_dc">5.2.4. Notes</h4> +<div class="paragraph"><p>The user needs to add additional information by hand in order to have a more +complete dive record. The information below is almost identical for +hand-entered dives and for dives downloaded from a dive computer.</p></div> +<div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when +entering a dive by hand or when a dive computer does not privide the date +and time of the dive. (Often, the date and time of the dive, gas mixture +and water temperature are usually shown as obtained from the dive computer) +If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the +message in a blue box at the top of the panel indicates that the dive is +being edited. If one clicks on the <strong>Notes</strong> tab, the following fields are +visible (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> +</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 +clicking the date, a calendar is displayed from which one can choose the +correct date. Press ESC to close the calendar. The time values (hour and +minutes) can also be edited directly by clicking on each of them in the text +box and by overtyping the information displayed.</p></div> +<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown +in these fields to the right of the Start time. Many dive computers supply water +temperature information and this field may therefore contain information obtained from the dive computer. If air temperature is not provided by the dive computer, the first temperature reading
might be used for the air temperature. Generally this is close enough to the real air temperature as
the change in the temperature sensor reading is quite slow to follow the changes in the environment.
If editing is required, only a value is required, the units of temperature will be
-automatically supplied by
-<em>Subsurface</em> (according to the <em>Preferences</em>, metric or imperial units will
-be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: In this field one should type in text that describes the site
-where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary".
-Auto completion of location names will
-make this easier if one frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-The user can find the coordinates on the world map in the bottom right hand
- part of the Subsurface window. The map displays a green bar indicating "Move
- the map and double-click to set the dive location". Double-click at the
- appropriate place, the green bar disappears and the coordinates are stored.
-</p>
-</li>
-<li>
-<p>
-The user can obtain the coordinates from the <em>Subsurface</em> Companion app if
- an Android or iPhone device with GPS was used and if the coordinates of the
- dive site were stored using that device. <a href="#S_Companion">Click here for
- more information</a>
-</p>
+automatically supplied by +<em>Subsurface</em> (according to the <em>Preferences</em>, metric or imperial units will +be used).</p></div> +<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake +Balaton, Hungary". Dive locations are managed as a separate part of the dive log. +After entering the information for a particilar dive site, and several dives are +performed at the same location, the information is re-used without requiring +full dive site information again. Existing dive location information +can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site +and by opening the location information by clicking the globe button on the +right of the location name (see image on the right above). When entering a dive location name, auto completion of +location names makes it easy to select a dive site that already exists in the dive log +(i.e. when typing in the name of a dive site, +a dropdown list appears showing all sites with similar names). If the dive +site has been used before, click on the already-existing name.</p></div> +<div class="paragraph"><p>If the present dive site has not been used before, a message appears as +follows (image <strong>A</strong> below):</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" /> +</div> +</div> +<div class="paragraph"><p>Click the + icon on the right hand side. A panel appears to enter the +coordinates and other important information about the site (image <strong>B</strong>, +above). The most important items are the coordinates of the site. There are +three ways of specifying the coordinates:</p></div> +<div class="olist loweralpha"><ol class="loweralpha"> +<li> +<p> +One can find the coordinates on the world map in the bottom right hand part + of the Subsurface window. The map displays an orange bar indicating "No + location data - Move the map and double-click to set the dive + location". Upon a double-click at the appropriate place, the orange bar + disappears and the coordinates are stored. +</p> +</li> +<li> +<p> +The coordinates can be obtained from the <em>Subsurface</em> Companion app if the + user has an Android or iPhone device with GPS and if the coordinates of the + dive site were stored using that device. <a href="#S_Companion">Click here for + more information</a> +</p> </li>
<li>
<p>
@@ -1268,19 +1086,25 @@ 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.</p></div>
-<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
-name - so adding coordinates to dives that do not have a location
-description will cause unexpected behaviour (Subsurface will think that all
-of these dives have the same location and try to keep their GPS coordinates
-the same).</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives),
-Freedive (dive without SCUBA equipment), CCR (Closed-circuit
+</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 +W20d.</p></div> +<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location +name - so adding coordinates to dives that do not have a location description +will cause unexpected behaviour (Subsurface will think that all of these +dives have the same location and try to keep their GPS coordinates the +same).</p></div> +<div class="paragraph"><p>Enter any other textual information about the dive site (Description and +Notes), then select <em>Apply Changes</em> to save the information for this dive +site. At a later stage the dive site information can be edited by clicking +the globe icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div> +<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive +performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives), +Freedive (dive without SCUBA equipment), CCR (Closed-circuit rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
entered in this field
@@ -1307,41 +1131,38 @@ program will list the tags that correspond to the typing. For instance, if the user
typed
<code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
-tabs in the info panel and in the dive profile panel, so there’s no need to
-use them until ALL other information has been added. Here is an example of a
-completed Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipment_2">5.2.5. Equipment</h4>
-<div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder
-and gas used as well as the weights used for the dive. The message in a blue
-box at the top of the panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />
-</div>
-</div>
-<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part
+<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div> +<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for +tabs in the info panel and in the dive profile panel, so there’s no need to +use them until ALL other information has been added. The image +<a href="#S_Notes_dc">at the beginning of this section</a> shows an example of a +<strong>Notes tab</strong> containing dive information.</p></div> +</div> +<div class="sect3"> +<h4 id="_equipment">5.2.5. Equipment</h4> +<div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder +and gas used as well as the weights used for the dive. The message in a blue +box at the top of the panel:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" /> +</div> +</div> +<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part of <em>Subsurface</em> and the information on cylinders and gases (entered here)
determines the behaviour of the dive profile (top right-hand panel).</p></div>
<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>
-</div>
-<div class="paragraph"><p>In most cases <em>Subsurface</em> obtains the gas used from the dive computer and
-automatically inserts the gas composition(% oxygen) in the table. The<br />
-button at the top right allows the user to add more cylinders for this
-dive. The dark dustbin icon on the left allows the deletion of information
+<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 +computers <em>Subsurface</em> often obtains the gas used from the dive computer and +automatically inserts the gas composition(% oxygen) in the table. The<br /> +button at the top right allows the user to add more cylinders for this +dive. The dark dustbin icon on the left allows the deletion of information for a cylinder. Note that it is not possible to delete a cylinder if it is
used during the dive. A cylinder might be implicitly used in the dive, even
without a gas change event.</p></div>
@@ -1484,14 +1305,15 @@ If one hovers using the mouse over the red bookmark, the appropriate text is </div>
</div>
<div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.8. 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>Save</em> button is clicked, the dive data are saved. If the <em>Cancel</em>
-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> +<h4 id="_saving_the_updated_dive_information">5.2.8. 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 +image of the dive. If the <em>Discard changes</em> button is clicked, then the +newly entered dive data are erased from the computer memory, although the +dive profile is retained. When the user exits <em>Subsurface</em> there is a final +prompt to confirm that the new data should now be saved permanently on the +computer disk.</p></div> </div> </div> <div class="sect2"> @@ -1502,9 +1324,9 @@ 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 -be imported by <em>Subsurface</em>. Currently, <em>Subsurface</em> supports importing CSV
-log files from several sources. APD LogViewer, XP5, Sensus and Seabear
-files are preconfigured, but because the import is flexible, users can
+be imported by <em>Subsurface</em>. Currently, <em>Subsurface</em> supports importing CSV +log files from several sources. APD LogViewer, XP5, Sensus and Seabear +files are preconfigured, but because the import is flexible, users can configure their own imports. Manually kept log files (e.g. in spreadsheet)
can also be imported by configuring the CSV import. <em>Subsurface</em> can also
import UDDF and UDCF files used by some divelog software and some dive
@@ -1560,9 +1382,9 @@ Poseidon MkVI CCR logs <p>
JDiveLog
</p>
-</li>
-<li>
-<p>
+</li> +<li> +<p> Suunto Dive Manager (DM3 and DM4) </p> </li> @@ -1613,7 +1435,7 @@ The dive log data from Mares Dive Organiser need to be exported to the </li> <li> <p> -Data should then be imported into <em>www.divelogs.de</em>. One needs to create a
+Data should then be imported into <em>www.divelogs.de</em>. One needs to create a 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 @@ -1666,9 +1488,9 @@ organised into a single line that provides the headers (or <em>field names</em> 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>
-<p>
+<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,
dive duration, names of buddy and dive master and perhaps some information
@@ -2382,9 +2204,9 @@ thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>
window. A photo can be deleted from the <em>Photos</em> panel by selecting it
(single-click) and then by pressing the <em>Del</em> key on the keyboard. This
-removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>
-</div>
-<div class="sect3">
+removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div> +</div> +<div class="sect3"> <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 @@ -2543,10 +2365,10 @@ steps:</p></div> </li> <li> <p> -<strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported
- from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.
- Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
- selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the
+<strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported + from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile. + Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then + selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the 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 @@ -2636,9 +2458,9 @@ dive at 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>,
+<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 @@ -2653,38 +2475,38 @@ the universal import dialogue. See the section below for</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>
-<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
- sensors are treated as spurious. If one of the three sensors provides
- spurious data, it is ignored.
-</p>
-</li>
-<li>
-<p>
-If no sensor data is 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
+<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 + sensors are treated as spurious. If one of the three sensors provides + spurious data, it is ignored. +</p> +</li> +<li> +<p> +If no sensor data is 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 turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel (accessible by selecting <a href="#S_CCR_options"><em>File → Preferences → @@ -2705,50 +2527,50 @@ partial 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
-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
-cylinder pressure data. In this case there is good agreement from the
+</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 +cylinder pressure data. In this case there is good agreement from the readings of the two oxygen sensors.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -2765,6 +2587,11 @@ 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> <div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However, this can be set to red by checking the appropriate check box after selecting <em>File → Preferences → Graph</em>. Below is a dive profile indicating the dive @@ -2780,18 +2607,18 @@ Poseidon MkVI and APD equipment can be found in 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
+</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>
@@ -3341,9 +3168,9 @@ Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 mete </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
+<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>. @@ -3377,9 +3204,9 @@ a group of dives and then right-clicking.</p></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
+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 above). Select an item to be shown in the <strong>Dive List</strong> or to be deleted from
the dive list, and the list is immediately updated accordingly. Preferences
for information shown in the <strong>Dive List</strong> is saved and used when <em>Subsurface</em>
@@ -3389,9 +3216,9 @@ is re-opened.</p></div> <h4 id="_selecting_dives_from_a_particular_dive_site">7.1.2. Selecting dives from a particular dive site</h4>
<div class="paragraph"><p>Many divers have long dive lists and it may be difficult to locate all the
dives at a particular site. By pressing <em>Ctl-F</em> on the keyboard, a text box
-is opened at the top left hand of the <strong>Dive List</strong>. Type the name of a dive
-site in this text box and the <strong>Dive List</strong> is immediately filtered to show
-only the dives for that site.</p></div>
+is opened at the top left hand of the <strong>Dive List</strong>. Type the name of a dive +site in this text box and the <strong>Dive List</strong> is immediately filtered to show +only the dives for that site.</p></div> </div> </div> <div class="sect2"> @@ -3477,8 +3304,8 @@ completed action on the right (B):</p></div> <img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" /> </div> </div> -</div>
-</div>
+</div> +</div> <div class="sect2"> <h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3> <div class="sect3"> @@ -3591,18 +3418,18 @@ Exporter les informations de plongée vers <em>Facebook</em> </li> <li> <p> -<a href="#S_Export_other">Exporter des informations de plongée vers d’autres
- destinations ou formats</a>
-</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>
<div class="paragraph"><p>L’export des plongées vers <em>Facebook</em> est géré différemment des autres types
d’export. Cela est du au fait que l’export vers <em>Facebook</em> nécessite une
-connexion vers <em>Facebook</em>, nécessitant un identifiant et un mot de passe. À
-partir du menu principal, si vous sélectionnez <em>Fichier → Préférences →
-Facebook</em>, un écran de connexion est présenté (voir l’image <strong>A</strong> sur la
+connexion vers <em>Facebook</em>, nécessitant un identifiant et un mot de passe. À +partir du menu principal, si vous sélectionnez <em>Fichier → Préférences → +Facebook</em>, un écran de connexion est présenté (voir l’image <strong>A</strong> sur la 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 @@ -3653,9 +3480,9 @@ gives two options: save ALL dives, or save only the dives selected in <strong>Di 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 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>
@@ -3775,9 +3602,9 @@ 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">
-<h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>
+</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 record of diving activities for one’s own pleasure, but it is important @@ -3886,13 +3713,13 @@ from the Internet and can be accessed from any place with Internet access. Currently there are no costs involved for this service. Dropbox (Windows, Mac and Linux) can be installed by accessing the <a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a> -Alternatively one can use <em>Dropbox</em> as a mechanism to backup one’s dive
-log. To Store a dive log in the Cloud, select <em>File → Save as</em> from the
-<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
-<em>Save</em> button. To access the dive log in the Cloud, select <em>File → Open
-Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
-in the <em>Dropbox</em> 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
+Alternatively one can use <em>Dropbox</em> as a mechanism to backup one’s dive +log. To Store a dive log in the Cloud, select <em>File → Save as</em> from the +<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the +<em>Save</em> button. To access the dive log in the Cloud, select <em>File → Open +Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file +in the <em>Dropbox</em> 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> @@ -4063,35 +3890,35 @@ information on how to write or modify a template.</p></div> <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, -les familles d’ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
-et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
-Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
-lues et modifiées. La première étape est de s’assurer que les pilotes pour
-votre ordinateur de plongée sont installés et que le nom de périphérique de
-l’ordinateur de plongée est connu. Voir
-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> pour plus d’informations sur la manière de procéder.</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 qui ouvre et sélectionne 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>
-<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :</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
+les familles d’ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3) +et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et +Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être +lues et modifiées. La première étape est de s’assurer que les pilotes pour +votre ordinateur de plongée sont installés et que le nom de périphérique de +l’ordinateur de plongée est connu. Voir +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> pour plus d’informations sur la manière de procéder.</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 qui ouvre et sélectionne 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> +<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions +suivantes peuvent être réalisées :</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>
@@ -4222,9 +4049,9 @@ the dive profile: <div class="ulist"><ul>
<li>
<p>
-<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.
- Not all dive computers report ceiling values. If the dive computer does report it, it may differ
- from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a
+<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. + Not all dive computers report ceiling values. If the dive computer does report it, it may differ + from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a dive computer can calculate ceilings during a dive. </p> </li> @@ -4256,9 +4083,9 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d 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 - respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
- factors of 20/60 are considered conservative and values of 60/90 are considered
- harsh. Checking <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
+ respect to nitrogen loading and the deeper the ascent ceilings are. Gradient + factors of 20/60 are considered conservative and values of 60/90 are considered + harsh. Checking <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>
@@ -4349,9 +4176,9 @@ on the Internet.</p></div> </div>
<div class="paragraph"><p>This is important, for instance, when <em>Subsurface</em> needs to communicate with
Internet services such as the <a href="#S_Companion"><em>Subsurface Companion app</em></a> or
-data export/import from <em>Divelogs.de</em>. These Internet requirements are
-determined by one’s type of connection to the Internet and by the Internet
-Service Provider (ISP) used. One’s ISP should provide the appropriate
+data export/import from <em>Divelogs.de</em>. These Internet requirements are +determined by one’s type of connection to the Internet and by the Internet +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 @@ -4384,9 +4211,9 @@ plongée vers Facebook</a> pour plus d’informations.</p></div> <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 -addition of gradient factors as implemented by Erik Baker.</p></div>
-<div class="sidebarblock">
-<div class="content">
+addition of gradient factors as implemented by Erik Baker.</p></div> +<div class="sidebarblock"> +<div class="content"> <div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -4439,9 +4266,9 @@ A user who is not absolutely sure about any of the above requirements should <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
-into the several sections on the left hand side of the screen. The setup is
-divided into several sections: Available Gases, Rates, Planning, Gas Options
-and Notes.</p></div>
+into the several sections on the left hand side of the screen. The setup is +divided into several sections: Available Gases, Rates, Planning, Gas Options +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 @@ -4715,30 +4542,30 @@ edited by hand in order to obtain a precise presentation of the dive plan. In fact, one can create the whole dive profile by editing the <em>Dive Planner Points</em> dialog.</p></div> <div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as -explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions
-defined in the table with <em>Available Gases</em>. If two or more gases are used,
-automatic gas switches will be suggested during the ascent to the
-surface. However, these changes can be deleted by right-clicking the gas
-change and by manually creating a gas 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">
-<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />
-</div>
-</div>
-<div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em>
-button towards the top middle of the planner. The saved dive plan will
-appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
+explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions +defined in the table with <em>Available Gases</em>. If two or more gases are used, +automatic gas switches will be suggested during the ascent to the +surface. However, these changes can be deleted by right-clicking the gas +change and by manually creating a gas 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"> +<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" /> +</div> +</div> +<div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em> +button towards the top middle of the planner. The saved dive plan will +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 @@ -4815,36 +4642,36 @@ 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
-repetitive dive set is specified appropriately in the top left-hand <em>Start
-Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and
-the effect of the first dive is evaluated on later dives.</p></div>
-<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,
-then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
-and then activate the planner. Depending on the start time of the planned
-dive, the planner takes into account the gas loading incurred during the
-completed dive and allows planning within these limitations.</p></div>
-<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
-template dive can be created conforming to one of the configurations. If one
-now wishes to plan a dive using this configuration, just highlight the
-template dive in the <strong>Dive List</strong> and activate the planner: the planner takes
-into account the configuration in the highlighted dive.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>
-<div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive
-Plan Details</em> for wet notes. Alternatively one can cut and paste the <em>Dive
-Plan Details</em> for inclusion 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,
-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>
-facility on the main menu in the same way as for dive logs or by copy and
+<div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the +repetitive dive set is specified appropriately in the top left-hand <em>Start +Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and +the effect of the first dive is evaluated on later dives.</p></div> +<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive, +then highlight, in the <strong>Dive List</strong>, the dive that has just been completed +and then activate the planner. Depending on the start time of the planned +dive, the planner takes into account the gas loading incurred during the +completed dive and allows planning within these limitations.</p></div> +<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a +template dive can be created conforming to one of the configurations. If one +now wishes to plan a dive using this configuration, just highlight the +template dive in the <strong>Dive List</strong> and activate the planner: the planner takes +into account the configuration in the highlighted dive.</p></div> +</div> +<div class="sect2"> +<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3> +<div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive +Plan Details</em> for wet notes. Alternatively one can cut and paste the <em>Dive +Plan Details</em> for inclusion 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, +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> +facility 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>
@@ -4886,9 +4713,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
</p>
</li>
-<li>
-<p>
-<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
+<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> @@ -4921,9 +4748,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <li> <p> <em>Quitter</em> - Quitter <em>Subsurface</em>. -</p>
-</li>
-</ul></div>
+</p> +</li> +</ul></div> </div>
<div class="sect2">
<h3 id="_importer">14.2. Importer</h3>
@@ -4952,9 +4779,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <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>
+</p> +</li> +</ul></div> </div> <div class="sect2"> <h3 id="_journal_log">14.3. Journal (log)</h3> @@ -4993,9 +4820,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <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>
+ 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>
@@ -5101,9 +4928,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p>
</li>
<li>
-<p>
-<em>Manuel utilisateur</em> - Ouvre une fenêtre affichant ce manuel utilisateur.
-</p>
+<p> +<em>Manuel utilisateur</em> - Ouvre une fenêtre affichant ce manuel utilisateur. +</p> </li> </ul></div> </div> @@ -5143,9 +4970,9 @@ storage.</p></div> <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 -communiquer avec l’ordinateur de plongée de la façon utilisée par
-l’ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
-</tr></table>
+communiquer avec l’ordinateur de plongée de la façon utilisée par +l’ordinateur de plongée (Bluetooth, USB, infra-rouge).</td> +</tr></table> </div>
<div class="ulist"><ul>
<li>
@@ -5165,9 +4992,9 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la </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
+<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 @@ -5181,9 +5008,9 @@ de documents et logiciels Silicon Labs</a>.</p></div> <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, -généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le
-bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
-désactivée si aucun nom de périphérique n’est nécessaire. Dans les rares cas
+généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le +bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera +désactivée si aucun nom de périphérique n’est nécessaire. Dans les rares cas où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
nom de votre périphérique ;</td>
</tr></table>
@@ -5254,9 +5081,9 @@ d’Ubuntu : <code>sudo usermod -a -G dialout johnB</code>) Cela ajoute joh <code>dialout</code>.
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.
+l’appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait +être listé +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 @@ -5270,16 +5097,16 @@ vous devriez pouvoir importer vos plongées.</p></div> <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 and Petrel there is a different
-procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
-these steps:</td>
+Weikamp Frog or the Shearwater Predator and Petrel there is a different +procedure to get the devices name to communicate with <em>Subsurface</em>. Follow +these steps:</td> </tr></table>
</div>
<div class="ulist"><ul>
<li>
-<p>
-<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
-</p>
+<p> +<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong> +</p> </li> </ul></div> <div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user @@ -5616,9 +5443,9 @@ for OSX 10.6 or higher.</p></div> <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
+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> @@ -5632,12 +5459,12 @@ the DR5.</td> <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
+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> @@ -5651,27 +5478,27 @@ BLACK.</td> <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 -encounter issues when downloading, showing errors like <em>Slip RX: unexp. SLIP
-END</em> on the Predator. This might also arise when using other dive log
-software and operating systems other than Linux. We have no detailed idea
-about the source and how to fix this, but it is reported to be solved
-sometimes by one of these steps:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-use the Bluetooth dongle which came with the Shearwater Predator instead of
- the built-in one of the <em>Subsurface</em> computer
-</p>
-</li>
-<li>
-<p>
-switch to different Bluetooth drivers for the same hardware
-</p>
-</li>
-<li>
-<p>
+encounter issues when downloading, showing errors like <em>Slip RX: unexp. SLIP +END</em> on the Predator. This might also arise when using other dive log +software and operating systems other than Linux. We have no detailed idea +about the source and how to fix this, but it is reported to be solved +sometimes by one of these steps:</td> +</tr></table> +</div> +<div class="ulist"><ul> +<li> +<p> +use the Bluetooth dongle which came with the Shearwater Predator instead of + the built-in one of the <em>Subsurface</em> computer +</p> +</li> +<li> +<p> +switch to different Bluetooth drivers for the same hardware +</p> +</li> +<li> +<p> switch off WiFi while using Bluetooth </p> </li> @@ -5685,9 +5512,9 @@ switch off WiFi while using Bluetooth <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
+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 logs. Communication between dive computer and desktop computer utilises the
IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
comprising three files:</td>
@@ -5707,9 +5534,9 @@ Dive log details (file with a .csv extension) </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>
+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> <div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log @@ -5723,14 +5550,14 @@ information.</p></div> <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
+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>
+<em>Subsurface</em> as follows:</td> +</tr></table> +</div> <div class="ulist"><ul> <li> <p> @@ -5742,10 +5569,10 @@ Download the dive using <em>AP Communicator</em>. 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> +<p> +Select the tab at the top of the screen, entitled "<em>Data</em>". +</p> </li> <li> <p> @@ -5765,10 +5592,10 @@ Copy the contents of the clipboard into the text editor and save the text </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>
+<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> @@ -5824,17 +5651,17 @@ performed using the dialogue found by selecting <em>Import</em> from the Main Me 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>
+<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>
+<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 @@ -5848,9 +5675,9 @@ Linux and/or Windows.</p></div> <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
+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>
@@ -5866,9 +5693,9 @@ Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs 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
+<li> +<p> +In the navigation tree on the left side of the program-window, select the appropriate dives. </p> </li> @@ -5901,9 +5728,9 @@ 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
+<li> +<p> +Click the browse button next to the field Export Path </p>
<div class="ulist"><ul>
<li>
@@ -6002,9 +5829,9 @@ From the file menu select the location and name for the backup, we’ll use <p>
Click <em>Save</em>
</p>
-</li>
-<li>
-<p>
+</li> +<li> +<p> The dives are now exported to the file DM4.bak (or DM5.bak) </p> </li> @@ -6018,8 +5845,8 @@ The dives are now exported to the file DM4.bak (or DM5.bak) <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
+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> @@ -6033,10 +5860,10 @@ directly imported to Subsurface.</td> <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 -Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
-database includes all Dive Organiser-registered divers on the particular
-computer and all Mares dive computers used. The safest way to obtain a copy
-of the dive database is to export the information to another compatible
+Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The +database includes all Dive Organiser-registered divers on the particular +computer and all Mares dive computers used. The safest way to obtain a copy +of the dive database is to export the information to another compatible format which can be imported into <em>Subsurface</em>.</td>
</tr></table>
</div>
@@ -6058,9 +5885,9 @@ Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a <p>
Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
</p>
-</li>
-<li>
-<p>
+</li> +<li> +<p> The password for accessing the .zip file is <em>mares</em>. </p> </li> @@ -6176,9 +6003,9 @@ this:</p></div> </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;">
+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>
@@ -6187,9 +6014,9 @@ file type and select the option <em>Edit filter settings</em>.</p></div> 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 class="content"> +<img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" /> +</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 @@ -6203,9 +6030,9 @@ 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> -<div class="ulist"><ul>
-<li>
-<p>
+<div class="ulist"><ul> +<li> +<p> In Microsoft Windows, click the <strong>Start</strong> button, and then select <em>Control
Panel</em> from the list on the right-hand side.
</p>
@@ -6257,9 +6084,9 @@ the appropriate folder has been selected to save the CSV file into.</p></div> <div class="content">
<img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />
</div>
-</div>
-<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder
-that was selected. One can double check the .CSV file by opening it with a
+</div> +<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder +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> @@ -6625,9 +6452,9 @@ 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 -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
+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>
@@ -6644,9 +6471,9 @@ the compressibility, your gas use is:</p></div> 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
+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 @@ -6691,7 +6518,7 @@ salvaged after being over written by new dives.</p></div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-09-08 10:31:18 CEST +Last updated 2015-09-09 14:51:47 CEST </div> </div> </body> |