summaryrefslogtreecommitdiffstats
path: root/Documentation/user-manual_fr.html.git
diff options
context:
space:
mode:
authorGravatar Guillaume GARDET <guillaume.gardet@free.fr>2015-09-18 16:36:22 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-09-18 10:07:21 -0700
commitbf1300e5b5728930bc37e2d8880383a770abc41a (patch)
treee0685f67f7d1d8b9dcff93fcd8d25df2e193051a /Documentation/user-manual_fr.html.git
parent562dfa1c5d94cf5e4e423d3f535bfb570ff91fa1 (diff)
downloadsubsurface-bf1300e5b5728930bc37e2d8880383a770abc41a.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.git2130
1 files changed, 1082 insertions, 1048 deletions
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index e1e6c7dac..a050178da 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -395,9 +395,9 @@ install: function(toclevels) {
}
asciidoc.install(3);
-/*]]>*/
-</script>
-</head>
+/*]]>*/
+</script>
+</head>
<body class="article">
<div id="header">
</div>
@@ -423,9 +423,9 @@ Avez-vous besoin d&#8217;une façon d&#8217;enregistrer vos plongées utilisant
équipements loisirs, même sans utiliser d&#8217;ordinateur de plongée ?
</p>
</li>
-<li>
-<p>
-Utilisez-vous deux marques différentes d&#8217;ordinateurs de plongée, chacun avec
+<li>
+<p>
+Utilisez-vous deux marques différentes d&#8217;ordinateurs de plongée, chacun avec
son propre logiciel propriétaire pour télécharger les enregistrements des
plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert
ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
@@ -454,12 +454,18 @@ Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des
<li>
<p>
Avez-vous besoin d&#8217;un planificateur de plongée graphique intuitif qui
- intègre et prend en compte les plongées qui ont déjà été enregistrées ?
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs
-basés sur processeurs Intel (OS/X) et de nombreuses distributions
+ intègre et prend en compte les plongées qui ont déjà été enregistrées ?
+</p>
+</li>
+<li>
+<p>
+Do you need a way of storing or backing up your dive log on the Internet,
+ allowing you to view your dive log from anywhere, using an Internet browser?
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs
+basés sur processeurs Intel (OS/X) et de nombreuses distributions
Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes
matérielles et d&#8217;environnements logiciels où Qt et libdivecomputer sont
disponibles.</p></div>
@@ -487,9 +493,9 @@ activée par la combinaison de touches du clavier Ctrl-F ou commande-F. Un
champ de recherche apparait en bas de la fenêtre. Il suffit de l&#8217;utiliser
pour rechercher n&#8217;importe quel terme dans le manuel.</p></div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_le_sondage_utilisateur">2. Le sondage utilisateur</h2>
+</div>
+<div class="sect1">
+<h2 id="_le_sondage_utilisateur">2. Le sondage utilisateur</h2>
<div class="sectionbody">
<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses
utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des
@@ -534,11 +540,11 @@ graphique de la plongée sélectionnée dans la <strong>liste des plongées</str
taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
séparateurs, pour qu&#8217;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&#8217;emplacement
-de la plongée, les informations détaillées et le profil de la <em>plongée
-sélectionnée</em> sont affichées dans les panneaux respectifs. D&#8217;autre part, si
-plus d&#8217;une plongée est mise en surbrillance seule la dernière mise en
-surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
+<div class="paragraph"><p>Si une unique plongée est sélectionnée dans la <strong>liste des plongées</strong>,
+l&#8217;emplacement de la plongée, les informations détaillées et le profil de la
+<em>plongée sélectionnée</em> sont affichées dans les panneaux respectifs. D&#8217;autre
+part, si plusieurs plongées sont sélectionnées, la dernière mise en
+surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
plongées mises en surbrillances</em> sont affichées dans l&#8217;onglet <strong>Stats</strong> du
panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
durées, les températures de l&#8217;eau et le SAC (air consommé); temps total et
@@ -552,9 +558,9 @@ nombre de plongées sélectionnées).</p></div>
en sélectionnant l&#8217;option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
permet plusieurs choix d&#8217;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>
-<div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div>
-<div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div>
-<div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
+<div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div>
+<div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div>
+<div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
toutes les plongées mises en surbrillance.</p></div>
<div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div>
<div class="paragraph"><p>Comme la plupart des autre fonctions qui peuvent être accédée via le menu
@@ -565,9 +571,9 @@ d&#8217;exploitation et des divers langues, <em>Subsurface</em> peut utiliser di
touches de raccourcis et ne sont donc pas détaillées ici.</p></div>
<div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n&#8217;affiche aucune
information. Ceci parce que le programme n&#8217;a aucune information de plongée
-disponible. Dans les sections suivantes, le procédure pour créer a nouveau
-carnet de plongée sera détaillée.</p></div>
-</div>
+disponible. Dans les sections suivantes, le procédure pour créer a nouveau
+carnet de plongée sera détaillée.</p></div>
+</div>
</div>
<div class="sect1">
<h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
@@ -658,7 +664,7 @@ now be explained for data entry.</p></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
+<strong>Notes</strong> panel (see the image below). This message is displayed in all the
panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@@ -680,39 +686,38 @@ function of time) is indicated in the panel on the top right hand of the
<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;">
-<div class="content">
-<img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />
-</div>
-</div>
-<div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive
-profile, its position is indicated by two coloured lines (red and green) as
-shown below. The depth and time that the cursor represents are indicated at
-the top of the black information box (@ and D). The units (metric/imperial)
-on the axes are determined by the <strong>Preference</strong> settings. The dive profile
-itself comprises several line segments demarcated by waypoints (white dots
-on the profile, as shown above). The default dive depth is 15 m. If the
-dive depth was 20 m then the user needs to drag the appropriate waypoints
-downwards to represent 20 m. To add a waypoint, double-click on any line
-segment. To move an additional waypoint, drag it. To remove this waypoint,
-right-click on it and choose "Remove this point" from the context menu. The
-user needs to drag the waypoints to represent an accurate time duration for
-the dive. Below is a dive profile that represents a dive to 20 m for 30 min,
-followed by a 5 minute safety stop at 5 m.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />
-</div>
+<div class="content">
+<img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />
+</div>
+</div>
+<div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive
+profile, its position is indicated by two right-angled red lines as shown
+below. The time and depth represented by the cursor are indicated at the
+top of the black information box (@ and D). The units (metric/imperial) on
+the axes are determined by the <strong>Preference</strong> settings. The dive profile
+itself comprises several line segments demarcated by waypoints (white dots
+on the profile, as shown above). The default dive depth is 15 m. If the
+dive depth was 20 m then the user needs to drag the appropriate waypoints
+downwards to represent 20 m. To add a waypoint, double-click on any line
+segment. To move an additional waypoint, drag it. To remove this waypoint,
+right-click on it and choose "Remove this point" from the context menu. Drag
+the waypoints to represent an accurate time duration for the dive. Below is
+a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
+stop at 5 m.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />
</div>
-<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly
-indicated along the line segments of the dive profile. This defaults to the
+</div>
+<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly
+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. 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>
+case of the profile 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 (see image below).</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
@@ -739,9 +744,9 @@ of supported dive computers can be found at:
Supported dive computers</a>.</p></div>
<div class="admonitionblock">
<table><tr>
-<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
<td class="content">Several dive computers consume more power when they are in their
PC-Communication mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We
therefore recommend that the user checks if the dive computer is charged
@@ -772,19 +777,19 @@ The interface cable should be connected to a free USB port (or the Infra-red
or Bluetooth connection set up as described later in this manual)
</p>
</li>
-<li>
-<p>
-The dive computer should be placed into PC Communication mode.
- (Users should refer to the manual of their specific dive computer)
-</p>
-</li>
-<li>
-<p>
-In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#8594; Import
- From Dive Computer</em>. Dialogue <strong>A</strong> in the figure below appears:
-</p>
-</li>
-</ol></div>
+<li>
+<p>
+The dive computer should be placed into PC Communication mode.
+ (Se reporter au manuel de l&#8217;ordinateur de plongée)
+</p>
+</li>
+<li>
+<p>
+In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594; Import From Dive
+ Computer</em>. Dialogue <strong>A</strong> in the figure below appears:
+</p>
+</li>
+</ol></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" />
@@ -792,16 +797,13 @@ In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#85
</div>
<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in their memory, even
though these dives have already been imported to <em>Subsurface</em>. For that
-reason, if the divecomputer allows this, <em>Subsurface</em> only imports dives
-that have not been uploaded before. This makes the download process faster
-on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB). If, for some reason,
-the user wishes to import ALL dives from the dive computer, even though some
-may already be in the logbook, then check the check box labeled <em>Force
-download of all dives</em>.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
+reason, if the divecomputer allows this, <em>Subsurface</em> only imports dives
+that have not been uploaded before. This makes the download process faster
+on most dive computers and also saves battery power of the dive computer (at
+least for those not charging while connected via USB).</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the
<strong>vendor</strong> drop-down list select the make of the computer, e.g. Suunto,
Oceanic, Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model
@@ -839,13 +841,13 @@ If all the dives on the dive computer need to be downloaded, check the
</li>
<li>
<p>
-If the checkbox <em>Always prefer downloaded dives</em> has been checked and,
- during download, dives with identical date-times exist on the dive computer
- and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>
- divelog will be overwritten by the dive record from the dive computer
-</p>
-</li>
-<li>
+If the checkbox <em>Always prefer downloaded dives</em> has been checked and,
+ during download, dives with identical date-times exist on the dive computer
+ and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>
+ divelog will be overwritten by the dive record from the dive computer.
+</p>
+</li>
+<li>
<p>
The checkbox marked <em>Download into new trip</em> ensures that, after upload, the
downloaded dives are grouped together as a new trip(s) in the <strong>Dive List</strong>.
@@ -857,38 +859,32 @@ Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer l
<em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools
when problems with downloads are experienced (see below).
</p>
-</li>
-<li>
-<p>
-Then select the <em>Download</em> button. After successful download, Dialogue <strong>B</strong>
- in the figure above appears.
-</p>
-</li>
-<li>
-<p>
-With communication established, one can see how the data are retrieved from
- the dive computer. Depending on the make of the dive computer and/or number
- of recorded dives, this could take some time. Be patient. The <em>Download</em>
- dialogue shows a progress bar at the bottom of the dialogue (for some dive
- computers the progress information could be inaccurate as we cannot
- determine how much downloadable data there is until all data have been
- downloaded). When the download of the dive information is complete, all the
- imported dives appear in the <strong>Dive List</strong>, sorted by date and
- time. Disconnect and switch off the dive computer to conserve its battery
- power. If a particular dive is selected, the <strong>Dive Profile</strong> panel shows an
- informative graph of dive depth against time for that particular dive.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>After the dives have been downloaded, they appear in a tabular format on the
-righthand side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a
-row in the table, with the date, duration and depth shown. Next to each dive
-is a checkbox: check all the dives that need to be transfered to the <strong>Dive
-List</strong>. In the case of the image above, the last six dives are checked and
-will be transfered to the <strong>Dive List</strong>.</p></div>
-<div class="paragraph"><p>After this has been completed, select the OK button. The checked dives are
-transfered to the <strong>Dive List</strong>.</p></div>
-<div class="ulist"><ul>
+</li>
+<li>
+<p>
+Then select the <em>Download</em> button. With communication established, one can
+ see how the data are retrieved from the dive computer. Depending on the
+ make of the dive computer and/or number of recorded dives, this could take
+ some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the
+ bottom of the dialogue (for some dive computers the progress information
+ could be inaccurate as we cannot determine how much downloadable data there
+ is until all data have been downloaded). After successful download, Dialogue
+ <strong>B</strong> in the figure above appears. After the dives have been downloaded, they
+ appear in a tabular format on the righthand side of the dialogue (see image
+ <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
+ and depth shown. Next to each dive is a checkbox: check all the dives that
+ need to be transfered to the <strong>Dive List</strong>. In the case of the image above,
+ the last six dives are checked and will be transfered to the <strong>Dive
+ List</strong>. Then click the <em>OK</em> button at the bottom of the dialogue. All the
+ imported dives appear in the <strong>Dive List</strong>, sorted by date and
+ time. Disconnect and switch off the dive computer to conserve its battery
+ power.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>After this has been completed, select the OK button. The checked dives are
+transfered to the <strong>Dive List</strong>.</p></div>
+<div class="ulist"><ul>
<li>
<p>
If there is a problem in communicating with the dive computer, an error
@@ -979,39 +975,38 @@ information about the dives recorded on the dive computer.</p></div>
<h4 id="S_DeviceNames">5.2.2. Changing the name of a dive computer</h4>
<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive
-computer is the same make and model as one&#8217;s own and dive logs are uploaded
-from both dive computers to the same <em>Subsurface</em> computer, then one would
-perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one "Bob&#8217;s
-Suunto D4". Alternatively, perhaps a technical diver dives with two or more
-dive computers of the same model, the logs of both (or all) being uploaded.
-In this case it might be prudent to call one of them "Suunto D4 (1)" and
-another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>. On the
+computer is the same make and model as one&#8217;s own and dive logs are uploaded
+from both dive computers to the same <em>Subsurface</em> computer, then one would
+perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one "Bob&#8217;s
+Suunto D4". Alternatively, consider a technical diver dives with two or more
+dive computers of the same model, the logs of both (or all) being uploaded.
+In this case it might be prudent to call one of them "Suunto D4 (1)" and
+another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>. On the
<strong>Main Menu</strong>, select <em>Log &#8594; Edit device names</em>. A dialog opens, indicating
the current Model, ID and Nickname of the dive computers used for
upload. Edit the Nickname field for the appropriate dive computer. After
saving the Nickname, the dive logs show the nickname for that particular
device instead of the model name, allowing easy identification of devices.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
+</div>
+<div class="sect3">
+<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
<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="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
+<div class="sect4">
+<h5 id="S_Notes_dc">Notes</h5>
+<div class="paragraph"><p>To have a more complete dive record the user needs to add additional
+information by hand. The procedure below is virtually 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>
+and time of the dive. (Usually the date and time of the dive, gas mixture
+and water temperature are 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" />
@@ -1024,14 +1019,14 @@ 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.
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may therefore contain information.
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
+<em>Subsurface</em> (following 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.
@@ -1040,9 +1035,9 @@ 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,
+right of the location name (see image on the righ, above). When entering a dive location name, auto location of
+dive site names makes it easy to select a dive site that already exists in the dive log
+(i.e. when typing 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
@@ -1076,13 +1071,13 @@ The coordinates can be obtained from the <em>Subsurface</em> Companion app if th
</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>
+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,
+<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>
@@ -1099,47 +1094,47 @@ 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
+Notes), then select <em>Apply Changes</em> to save the geolocation 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),
+performed. The options are OC (Open Circuit SCUBA, 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
-which 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 enters the name(s) of the buddy / buddies
-(separated with commas) who accompanied him/her on the
-dive. Auto completion based on the list of buddies in the current logbook is
-offered.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: Here the type of diving suit used for the dive can be entered.
-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
+which offers auto selection based on the list of dive masters in
+the current logbook.</p></div>
+<div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
+(separated with commas) who accompanied him/her on the
+dive. Auto selection based on the list of buddies in the current logbook is
+offered.</p></div>
+<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
+Auto selection of the suit description is available.
+Some dry-suit users may choose to use this field to record what combination of
+suit and thermal 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 can be entered
here (separated by commas). Examples of common tags are boat, drift, training,
-cave, etc.
-<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the
-program
+cave, etc.
+<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the
+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&#8217;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 class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the
+information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so
+there&#8217;s no need to use them until <strong>ALL</strong> 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> after completion of the dive information.</p></div>
</div>
-<div class="sect3">
-<h4 id="_equipment">5.2.5. Equipment</h4>
+<div class="sect4">
+<h5 id="_equipment">Equipment</h5>
<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>
@@ -1150,7 +1145,7 @@ box at the top of the panel:</p></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>
+determines the behaviour of the <strong>Dive profile</strong> (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;">
@@ -1159,41 +1154,42 @@ like this:</p></div>
</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>
-<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of
-the table. To select a cylinder, the <strong>cylinder type</strong> box should be
-clicked. This brings up a list 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/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was
-used for this 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.</p></div>
-<div class="paragraph"><p>Next one must indicate the starting pressure and the ending pressure of the
-specified gas during the dive. The unit of pressure (metric/imperial)
-corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can
-be entered or this field can be left blank. If nitrox or trimix were used,
-their percentages of oxygen and/or helium should be entered. Any
-inappropriate fields should be left empty. After typing the information for
-the cylinder, either 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 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" />
+computers, <em>Subsurface</em> often obtains the gas used from the dive computer
+and automatically inserts the gas composition(% oxygen or % helium) in the
+table. The + 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>
+<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of
+the table. To select a cylinder, the <em>Type</em> box should be clicked. This
+brings up a list 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/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" />
+</div>
+</div>
+<div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was
+used for this 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 (<em>Work.press</em>) will automatically be shown in
+the dialogue.</p></div>
+<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
+specified gas during the dive. The unit of pressure (metric/imperial)
+corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
+<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can
+be entered or this field can be left blank. If nitrox or trimix were used,
+their percentages of oxygen and/or helium should be entered. Any
+inappropriate fields should be left empty. After typing the information for
+the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by
+clicking outside the cell containing the cursor. Information for any
+additional cylinders can be added by using the + button at the top right
+hand. Following is an example of a complete description for a dive 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 can be entered
@@ -1203,39 +1199,40 @@ the + button on the top right of the weights dialogue, the table looks like
this:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>By clicking on the <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 used
-during the dive or the user may start typing in the box which shows the
-available options for the entered characters. In the <strong>Weight</strong> field, type
-in the amount of weight used during the dive. After specifying the weight
-system, the user can either press <em>ENTER</em> on the keyboard or click outside
-the cell with 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 as well as a weight belt:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
-<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
-the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few
-items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
-<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
-fields remain empty. It may be useful to simultaneously edit some of the
+<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through
+a down-arrow:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
+</div>
+</div>
+<div class="paragraph"><p>This can be used to select the type of weight system used during the dive or
+the user may start typing in the box to specify a different weighting
+mechanism that will be saved by <em>Subsurface</em>. In the <strong>Weight</strong> field, type
+in the amount of weight used during the dive. After specifying the weight
+system, save the data by either pressing <em>ENTER</em> on the keyboard or by
+clicking outside the cell with 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 as well as a weight belt:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.4. Editing several selected dives simultaneously</h4>
+<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
+each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well as a few
+items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
+<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
+fields remain empty. It may be useful to simultaneously edit some of the
fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs. For instance, it is possible
that a diver performed several dives during a single day, using identical
equipment while diving at the same dive site or with the same dive master
@@ -1263,13 +1260,13 @@ copied from the currently selected dive, then select <em>OK</em>. Now, in the <s
List</strong>, select the dives into which this information is to be pasted. Then,
from the main menu, select <em>Log &#8594; Paste dive components</em>. All the selected
dives now contain the data initially selected in the original source dive
-log.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>
-<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular
-events during the dive, e.g. "Saw dolphins", or "Released surface
-buoy". This is easily done:</p></div>
+log.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_adding_bookmarks_to_a_dive">5.2.5. Adding Bookmarks to a dive</h4>
+<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular
+events during the dive, e.g. "Saw dolphins", or "Released surface
+buoy". This is easily done:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -1299,13 +1296,13 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
</li>
</ul></div>
<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
-</div>
+<div class="content">
+<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
+</div>
</div>
</div>
<div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
+<h4 id="_saving_the_updated_dive_information">5.2.6. 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
@@ -1327,30 +1324,32 @@ 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
-configure their own imports. Manually kept log files (e.g. in spreadsheet)
+configure their own imports. Manually kept log files (e.g. a 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
-computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some divelog
-software like Mares Dive Organiser it is currently suggested to import the
-logbooks first into a webservice like <em>divelogs.de</em> and then import them
+computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some divelog
+software like Mares Dive Organiser it is currently suggested to import the
+logbooks first into a webservice like <em>divelogs.de</em> and then import them
from there with <em>Subsurface</em>, as divelogs.de supports a few additional
logbook formats that <em>Subsurface</em> currently cannot parse.</p></div>
<div class="paragraph"><p>If the format of other software is supported natively on Subsurface, it
should be sufficient to select either <em>Import &#8594; Import log files</em> or <em>File
&#8594; Open log file</em>. <em>Subsurface</em> supports the data formats of many dive
computers, including Suunto and Shearwater. When importing dives,
-<em>Subsurface</em> tries to detect multiple records for the same dive and merges
-the information as best as it can. If there are no time zone issues (or
-other reasons that would cause the beginning time of the dives to be
-significantly different) <em>Subsurface</em> will not create duplicate entries.</p></div>
-<div class="sect3">
-<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
-<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal
-interface that is activated by selecting <em>Import</em> from the Main Menu, then
-clicking on <em>Import Log Files</em>. This brings up the dialogue <strong>A</strong> below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
+<em>Subsurface</em> tries to detect multiple records for the same dive and merges
+the information as best as it can. If there are no time zone issues (or
+other reasons that would cause the beginning time of the dives to be
+significantly different) <em>Subsurface</em> will not create duplicate
+entries. Below follows more specific information to achieve data import to
+<em>Subsurface</em>.</p></div>
+<div class="sect3">
+<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
+<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal
+interface activated by selecting <em>Import</em> from the Main Menu, then clicking
+on <em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
</div>
</div>
<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of
@@ -1362,12 +1361,17 @@ available, as in dialogue <strong>B</strong>, above. Currently these are:</p></d
XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
systems)
</p>
-</li>
-<li>
-<p>
-UDDF-formatted dive logs (e.g. Kenozoooid)
-</p>
-</li>
+</li>
+<li>
+<p>
+Cochran dive logs
+</p>
+</li>
+<li>
+<p>
+UDDF-formatted dive logs (e.g. Kenozoooid)
+</p>
+</li>
<li>
<p>
UDCF-formatted dive logs
@@ -1376,9 +1380,29 @@ UDCF-formatted dive logs
<li>
<p>
Poseidon MkVI CCR logs
-</p>
-</li>
-<li>
+</p>
+</li>
+<li>
+<p>
+APD Inspiration/Evolution CCR logs
+</p>
+</li>
+<li>
+<p>
+LiquiVision logs
+</p>
+</li>
+<li>
+<p>
+divelog.de logs
+</p>
+</li>
+<li>
+<p>
+OSTC Tools logs
+</p>
+</li>
+<li>
<p>
JDiveLog
</p>
@@ -1394,7 +1418,8 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
</p>
</li>
</ul></div>
-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the
+<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large
+window containing the file list on the right of the dialogue opens the
imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
accessible through the Import dialogue are also supported, as explained
below.</p></div>
@@ -1409,14 +1434,14 @@ the universal import dialogue. From the dropdown list at the bottom right
select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
logs visible in the file list panel. Select one or more dive, then click the
<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>Actually, every H&amp;W device supported by OSTCTools can be imported to
+<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to
<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>
<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a
useful set of tools for analysis and management of OSTC devices. This way,
-only raw dive computer data will be achieved with the import to
-<em>Subsurface</em>; user still have to manually complete the rest of data which
-may be of some importance for him (buddies, equipment, notes, etc).</p></div>
+only raw dive computer data will be performed with the import to
+<em>Subsurface</em>; one has to to manually complete the rest of data which may be
+important (buddies, equipment, notes, etc).</p></div>
</div>
<div class="sect3">
<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
@@ -1428,9 +1453,9 @@ information.</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
-The dive log data from Mares Dive Organiser need to be exported to the
- user&#8217;s desktop, using a <em>.sdf</em> file name extension. Refer to
- <a href="#Mares_Export">Appendix C</a> for more information.
+Export the dive log data from Mares Dive Organiser to the user&#8217;s desktop,
+ using a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a>
+ for more information.
</p>
</li>
<li>
@@ -1454,13 +1479,13 @@ Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, usin
<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
-selected from the Main Menu. This brings up a dialogue box (see figure on
-left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the
-appropriate fields and then select the <em>Download</em> button. Download from
-<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue
-box. At the end of the download, the success status is indicated (see figure
-on the right [<strong>B</strong>], below). The <em>Apply</em> button should then be selected,
-after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
+selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong>
+below). Enter a user-ID and password for <em>divelogs.de</em> into the appropriate
+fields and then select the <em>Download</em> button. Download from <em>divelogs.de</em>
+starts immediately, displaying a progress bar in the dialogue box. At the
+end of the download, the success status is indicated (see image <strong>B</strong>,
+below). The <em>Apply</em> button should then be selected, after which the imported
+dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
@@ -1494,9 +1519,9 @@ line.</p></div>
<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
- about cylinder pressures before and after the dive, as well as a comment or
- two about the dive. All the data for a single dive go on a single line of
- text, following the order of the column headings.
+ about cylinder pressures before and after the dive, as well as a comment or
+ two about the dive. All the data for a single dive go on a single line of
+ text, following the order of the column headings.
</p>
</li>
<li>
@@ -1516,18 +1541,18 @@ line.</p></div>
<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>one needs to
know a few things about the data being imported</strong>:</p></div>
<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-Which character separates the different columns within a single line of
- data? This field separator should be either a comma (,) or a TAB character.
- This can be determined by opening the file with a text editor. If it is
- comma-delimited, then the comma characters between the values are clearly
- visible. If no commas are evident and the numbers are aligned in columns,
- the file is probably TAB-delimited (i.e. it uses a TAB as a field
- separator).
-</p>
-</li>
-<li>
+<li>
+<p>
+Which character separates the different columns within a single line of
+ data? This field separator should be either a comma (,) a semicolon (;) or a
+ TAB character. This can be determined by opening the file with a text
+ editor. If it is comma-delimited or semicolon-delimited, the comma or
+ semicolon characters between the values are clearly visible. If these are
+ not evident and the numbers are aligned in columns, the file is probably
+ TAB-delimited (i.e. it uses a TAB as a field separator).
+</p>
+</li>
+<li>
<p>
Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV dive
details</em> file or a <em>CSV dive profile</em> file? Open the file using a text
@@ -1559,34 +1584,32 @@ use the <em>Manual Import</em> option. The configuration panel also has dropdown
lists for the specification of the appropriate field separator (Tab, comma
or semicolon), the date format used in the <em>CSV</em> file, the time units
(seconds, minutes or minutes:seconds), as well as the unit system (metric or
-imperial). Selecting the appropriate options among these is critical for the
-successful import of the data.</p></div>
-<div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the
-appropriate column headings. The top line of the white part of the data
-table contains the column headings found in the <em>CSV</em> data file. The blue
-row of cells immediately above these contains the names understood by
-<em>Subsurface</em>. The white area below the dropdown lists contains all the field
-names that <em>Subsurface</em> recognises. These names are in blue balloons and can
-be moved using a drag-and-drop action. For instance, <em>Subsurface</em> expects
-the column heading for Dive number (" # ") to be "Dive # ". If the column
-heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
-appropriate column heading from the upper area and drop it in the
-appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item labeled "Dive # " and drop it
-in the blue cell immediately above the white cell containing " # ". This is
+imperial). Selecting the appropriate options among these is critical for the
+successful import of the data.</p></div>
+<div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the
+appropriate column headings. The top blue row of the data table contains the
+column headings found in the <em>CSV</em> data file. The blue row of balloons
+immediately above these contains the names understood by <em>Subsurface</em>. These
+balloons can be moved using a drag-and-drop action. For instance,
+<em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive
+# ". If the column heading that <em>Subsurface</em> expects is not in the blue row,
+then drag the appropriate balloon from the upper area and drop it in the
+appropriate blue cell at the top of the table. To indicate the correct
+column for "Dive #", drag the ballooned item labeled "Dive # " and drop it
+in the blue cell immediately above the white cell containing " # ". This is
depicted in the image below.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/csv_import2_f20.jpg" alt="FIGURE: CSV download dialogue 2" />
</div>
</div>
-<div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row
-of cells correspond to the headings listed in the top part of the
-dialogue. Having completed this task, select the <em>OK</em> button to the bottom
-right og the dialogue. The data from the <em>CSV</em> file are imported and shown
-in the <strong>Dive List</strong> panel.</p></div>
-<div class="sidebarblock" id="S_CSV_Intro">
-<div class="content">
+<div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row
+of cells correspond to the headings listed in the top part of the
+dialogue. Having completed this task, select the <em>OK</em> button to the bottom
+right of the dialogue. The data from the <em>CSV</em> file are imported and shown
+in the <strong>Dive List</strong> panel.</p></div>
+<div class="sidebarblock" id="S_CSV_Intro">
+<div class="content">
<div class="paragraph"><p><strong>A Diver&#8217;s Introduction to <em>CSV</em> Files</strong></p></div>
<div class="admonitionblock">
<table><tr>
@@ -1623,14 +1646,14 @@ using a comma as a field separator:</p></div>
<pre><code>Dive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy
Illovo Beach,2012-11-23,10:45,46:15,18.4,John Smith
Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald
-Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht
-Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre>
-</div></div>
-<div class="paragraph"><p>In this format the data are not easily read by a human. Here is the same
-information in TAB-delimited format:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Dive site Dive date Time Dive_duration Dive_depth Dive buddy
+Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht
+Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre>
+</div></div>
+<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information
+in TAB-delimited format:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Dive site Dive date Time Dive_duration Dive_depth Dive buddy
Illovo Beach 2012-11-23 10:45 46:15 18.4 John Smith
Key Largo 2012-11-24 09:12 34:15 20.4 Jason McDonald
Wismar Baltic 2012-12-01 10:13 35:27 15.4 Dieter Albrecht
@@ -1672,27 +1695,29 @@ file allows a smooth import of the dives into <em>Subsurface</em>.</p></div>
</td>
<td class="content">The <em>CSV</em> import has a couple of caveats. One should avoid some special
characters like ampersand (&amp;), less than (&lt;), greater than (&gt;) and double
-quotes (") as part of the numbers or text within a cell. The file should use
-UTF-8 character set, if using non-ASCII characters. Also the size of the
-<em>CSV</em> file might cause problems. Importing 100 dives at a time (<em>CSV dive
-details</em>) works, but larger files might exceed limits of the parser
-used. When encountering problems with <em>CSV</em> imports, first try with a
-smaller file to make sure everything works.</td>
-</tr></table>
-</div>
+quotes (") as part of the numbers or text within a cell. The file should use
+UTF-8 character set, if using non-ASCII characters. Also the size of the
+<em>CSV</em> file might cause problems. Importing 100 dives at a time (<em>CSV dive
+details</em>) works, but larger files might exceed the limits of the parser
+used. When encountering problems with <em>CSV</em> imports, first try with a
+smaller file to make sure everything works.</td>
+</tr></table>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
-<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> with a GPS or
-<a href="#S_iphone"><em>iPhone</em></a>, the coordinates for the diving location can be
-automatically passed to the <em>Subsurface</em> dive log. The Companion App stores
-the dive locations on a dedicated Internet-based file server. <em>Subsurface</em>,
-in turn, can collect the localities from the file server.</p></div>
-<div class="paragraph"><p>To do this:</p></div>
-<div class="sect3">
-<h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4>
+</div>
+<div class="sect2">
+<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
+<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> or
+<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
+for the diving
+location can be automatically passed to the <em>Subsurface</em>
+dive log. The Companion App stores the dive locations on
+a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
+the localities from the file server.</p></div>
+<div class="paragraph"><p>To do this:</p></div>
+<div class="sect3">
+<h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4>
<div class="ulist"><ul>
<li>
<p>
@@ -1812,13 +1837,13 @@ location (on the list or on the map), an editing panel opens (see <strong>C</str
where the dive description or other details may be changed.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="paragraph"><p>When one clicks on a dive (<strong>not</strong> selecting the check box), the name given to
-it, date/time and GPS coordinates will be shown, with two options at the top
-of the screen:</p></div>
-<div class="ulist"><ul>
+<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
+</div>
+</div>
+<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the name given to
+it, date/time and GPS coordinates will be shown, with two options at the top
+of the screen:</p></div>
+<div class="ulist"><ul>
<li>
<p>
Edit (pencil): Change the text name or other characteristics of the dive
@@ -2087,22 +2112,28 @@ Images</em>:</p></div>
to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
-</div>
-</div>
-<div class="paragraph"><p>This brings one to the time synchronisation dialog, shown below. The
-critical problem is that the time synchronisation is not perfect between the
-dive computer used during a dive, and the camera used during that same
-dive. These two devices often differ by several minutes. If <em>Subsurface</em> can
-achieve synchronisation, then the exact times of photographs can be used to
-position photographs on the dive profile.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in two ways:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
- difference in time between the two devices can be determined. Actually, as long as the device
- settings for time has not been changed in either device, one could write down the times of
+<img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
+</div>
+</div>
+<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The critical
+problem is that the time synchronisation is not perfect between the dive
+computer used during a dive, and the camera used during that same
+dive. These two devices often differ by several minutes. If <em>Subsurface</em> can
+achieve synchronisation, then the exact times of photographs can be used to
+position photographs on the dive profile.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
+ the time settings of the camera by changing the date-time settings on one or both of these devices.
+</p>
+</li>
+<li>
+<p>
+<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
+ difference in time between the two devices can be determined. Actually, as long as the device
+ settings for time has not been changed in either device, one could write down the times of
both devices after the dive or even at the end of the day. One can then manually set the time
difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool
immediately under the heading <em>Shift times of image(s) by</em>, evident in figure <strong>A</strong> below.
@@ -2122,54 +2153,54 @@ position photographs on the dive profile.</p></div>
<div class="ulist"><ul>
<li>
<p>
-<strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a
- photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain
- the exact time the photograph was taken, using the metadata that the camera stores within
- each photo. In order to do this, use the bottom half of the Time shift_ dialog. If one uses
- the bottom part, the top part of the dialog is ignored. Click on
- the horizontal bar entitled "<em>Select image of divecomputer showing time</em>. This brings up
- a file browser with which one can select the photograph of the dive computer. Select the
- photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
- appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
- when the photograph has been taken. Now set the date-time dialog to the left of the photo
- so that this tool reflects the date and time of the dive computer in the photo. When the
- date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
- camera and dive computer is, and synchronisation is achieved. There is a
- photograph with the face of the dive computer and with the date-time tool set to the
- date-time on image <strong>B</strong> above.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If the timestamp of a photograph is long before or after the dive, it is not
-placed on the dive profile. If the timestamp of the photo is within 30
-minutes of the dive, it is shown.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>In order to view the photos added to a dive, activate the <em>show-photos</em>
-button in the tool bar to the left of the dive profile:</p></div>
-<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
-</div>
-</div>
-<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
-<div class="ulist"><ul>
-<li>
+<strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a
+ photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain
+ the exact time the photograph was taken, using the metadata that the camera stores within
+ each photo. In order to do this, use the bottom half of the <em>Time shift</em> dialog. If one uses
+ the bottom part, the top part of the dialog is ignored. Click on
+ the horizontal bar entitled "<em>Select image of divecomputer showing time</em>. This brings up
+ a file browser with which one can select the photograph of the dive computer time. Select the
+ photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
+ appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
+ when the photograph has been taken. Now set the date-time dialog to the left of the photo
+ so that this tool reflects the date and time of the dive computer in the photo. When the
+ date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
+ camera and dive computer is, and synchronisation is achieved.
+ Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
+ date-time.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the
+dive, it is not placed on the dive profile.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
+<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
+<div class="ulist"><ul>
+<li>
<p>
the <em>Photos</em> tab of the <strong>Notes</strong> panel.
</p>
</li>
-<li>
-<p>
-as tiny icons (stubs) on the dive profile at the appropriate positions
- reflecting the time each photograph was taken. See below:
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
+<li>
+<p>
+as tiny icons (stubs) on the dive profile at the appropriate positions
+ reflecting the time each photograph was taken. In order to view the photos
+ on the dive profile, activate the <em>show-photos</em> button in the tool bar to
+ the left of the dive profile:
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
+</div>
+</div>
+<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
</div>
</div>
<div class="paragraph"><p>If one hovers with the mouse over any of the photo icons, then a thumbnail
@@ -2198,9 +2229,9 @@ the <em>Photos</em> tab (see text below).</p></div>
tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
(therefore sometimes with large overlap on the dive profile) can easily be
accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
-accessing the photos of a dive, while the stubs on the dive profile give an
-indication of when during a dive a photo was taken. By single-clicking on a
-thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
+accessing the photos of a dive, while the stubs on the dive profile give an
+indication of when during a dive a photo was taken. By single-clicking on a
+thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
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
@@ -2209,18 +2240,18 @@ removes the photo both from the <em>Photos</em> tab as well as the dive profile.
<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
-directly accessed by <em>Subsurface</em>. This facilitates the interaction between
-<em>Subsurface</em> and an external repository of photos. When associating a dive
-profile with photos from an external drive, the normal procedure of
-selection and synchronisation (see text above) is used. However, after the
-external drive has been disconnected, <em>Subsurface</em> cannot access these
-photos any more. If the display of photos is activated (using the toolbox
-to the left of the <em>Dive Profile</em>), the program only shows a small white dot
-where each photo should be on the dive profile. In addition the <em>Photos</em>
-tab only shows the file names of the photos. This is normal behaviour. If,
-later, the external drive with the photos is connected again, the photos can
-be seen in the normal way.</p></div>
+such a drive can be mapped by the operating system (almost always the case)
+the photos can be directly accessed by <em>Subsurface</em>. This facilitates the
+interaction between <em>Subsurface</em> and an external repository of photos. When
+associating a dive profile with photos from an external drive, the normal
+procedure of selection and synchronisation (see text above) is used.
+However, after the external drive has been disconnected, <em>Subsurface</em> cannot
+access these photos any more. If the display of photos is activated (using
+the toolbox to the left of the <em>Dive Profile</em>), the program only shows a
+small white dot where each photo should be on the dive profile. In addition
+the <em>Photos</em> tab only shows the file names of the photos. This is normal
+behaviour. If, later, the external drive with the photos is connected
+again, the photos can be seen in the normal way.</p></div>
</div>
<div class="sect3">
<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
@@ -2271,16 +2302,16 @@ if there is a match between a calculated fingerprint and the one originally
<td class="icon">
<img src="images/icons/important.png" alt="Important" />
</td>
-<td class="content">Software for the automated update of existing photo collections is under
-developement. Currently single dives must be upgraded one at a time. Select
-the toolbar button on the <strong>Dive profile</strong> panel that enables the display of
-images. The thumbnails of images are shown on the dive profile. Then open
-the dive and change anything in the <strong>Notes</strong> panel that brings up the blue
-edit bar at the top of the notes panel to save the edits. For instance, add
-a space character at the end of the <em>Notes</em> text box and immediately delete
-that space character. Select the optio <em>Apply changes</em> in the blue edit bar
-to save the dive information. Fingerprints are calculated while saving this
-specific dive.</td>
+<td class="content">Software for the automated finger print calculation of existing photo
+collections is under developement. Currently single dives must be upgraded
+one at a time. Select the toolbar button on the <strong>Dive profile</strong> panel that
+enables the display of images. The thumbnails of images are shown on the
+dive profile. Then open the dive and change anything in the <strong>Notes</strong> panel
+that brings up the blue edit bar at the top of the notes panel to save the
+edits. For instance, add a space character at the end of the <em>Notes</em> text
+box and immediately delete that space character. Select the optio <em>Apply
+changes</em> in the blue edit bar to save the dive information. Fingerprints
+are calculated while saving this specific dive.</td>
</tr></table>
</div>
</div></div>
@@ -2348,12 +2379,12 @@ steps:</p></div>
<p>
<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
- cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
+ cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
<em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
- from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
+ from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
</p>
</li>
<li>
@@ -2471,7 +2502,8 @@ format and the directory where the original dive logs have been stored from
the CCR dive computer, one can select a particular dive log file (in the
case of the MkVI it is a file with a .txt extension). After selecting the
appropriate dive log, activate the <em>Open</em> button at the bottom right hand of
-the universal import dialogue. See the section below for</p></div>
+the universal import dialogue. The selected dive is imported to the
+<em>Subsurface</em> dive list.</p></div>
</div>
<div class="sect4">
<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
@@ -2500,7 +2532,7 @@ For THREE-sensor systems (e.g. APD), the mean value is also used. However
</li>
<li>
<p>
-If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to
+If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to
the setpoint.
</p>
</li>
@@ -2695,70 +2727,70 @@ cellspacing="0" cellpadding="4">
<tr>
<td align="left" valign="top"><p class="table">Orange</p></td>
<td align="left" valign="top"><p class="table">18 - 30</p></td>
-<td align="left" valign="top"><p class="table">9 - 18</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Jaune</p></td>
-<td align="left" valign="top"><p class="table">9 - 18</p></td>
-<td align="left" valign="top"><p class="table">4 - 9</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Vert clair</p></td>
-<td align="left" valign="top"><p class="table">1.5 - 9</p></td>
-<td align="left" valign="top"><p class="table">1.5 - 4</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Vert foncé</p></td>
-<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
-<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the
-graph. Thus, users should see the depth of the deepest point and other
-peaks. Mean depth is plotted as a grey line, indicating mean dive depth up
-to a particular moment during the dive.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/scale.jpg" alt="Note" />
-</td>
-<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
-Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of
-the dive profile frequently increases the size of the dive profile to fill
-the area of the panel efficiently.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
-placed adjacent to significant changes.</p></div>
-<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O2, N2,
-and He during the dive (see figure above) as well as a calculated and dive
-computer reported deco ceilings (only visible for deep, long, or repetitive
-dives). Partial pressures of oxygen are indicated in green, those of
-nitrogen in black, and those of helium in dark red. These partial pressure
-graphs are shown below the profile data.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/O2.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>
-during the dive. This is depicted below the dive depth and water temperature
-graphs.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/N2.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong>
-during the dive.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
+<td align="left" valign="top"><p class="table">9 - 18</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Jaune</p></td>
+<td align="left" valign="top"><p class="table">9 - 18</p></td>
+<td align="left" valign="top"><p class="table">4 - 9</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Vert clair</p></td>
+<td align="left" valign="top"><p class="table">1.5 - 9</p></td>
+<td align="left" valign="top"><p class="table">1.5 - 4</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Vert foncé</p></td>
+<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
+<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the
+graph. Thus, users should see the depth of the deepest point and other
+peaks. Mean depth is plotted as a grey line, indicating mean dive depth up
+to a particular moment during the dive.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/scale.jpg" alt="Note" />
+</td>
+<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
+Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of
+the dive profile frequently increases the size of the dive profile to fill
+the area of the panel efficiently.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
+placed adjacent to significant changes.</p></div>
+<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>,
+N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and
+dive computer reported deco ceilings (only visible for deep, long, or
+repetitive dives). Partial pressures of oxygen are indicated in green,
+those of nitrogen in black, and those of helium in dark red. These partial
+pressure graphs are shown below the profile data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/O2.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>
+during the dive. This is depicted below the dive depth and water temperature
+graphs.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/N2.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong>
+during the dive.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
<td class="icon">
<img src="images/icons/He.jpg" alt="Note" />
</td>
@@ -2965,20 +2997,20 @@ the mouse cursor is over the Dive Profile panel. The menu allows the
creation of Bookmarks or Gas Change Event markers or manual CCR set-point
changes other than the ones that might have been imported from a Dive
Computer. Markers are placed against the depth profile line and with the
-time of the event set by where the mouse cursor was when the right mouse
-button was initially clicked to bring up the menu. Gas Change events involve
-a selection of which gas is being switched to, the list of choices being
-based on the available gases defined in the Equipment Tab. Set-point change
-events open a dialog allowing to choose the next set-point value. As in the
-planner, a set-point value of zero indicates the diver is breathing from an
-open circuit system while any non-zero value indicates the use of a closed
-circuit rebreather (CCR). By right-clicking while over an existing marker a
-menu appears, adding options to allow deletion of the marker or to allow all
-markers of that type to be hidden. Hidden events can be restored to view by
-selecting Unhide all events from the context menu.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>
+time of the event set by where the mouse cursor was when the right mouse
+button was initially clicked to bring up the menu. Gas Change events involve
+a selection of which gas is being switched to, the list of choices being
+based on the available gases defined in the <strong>Equipment</strong> Tab. Set-point
+change events open a dialog allowing to choose the next set-point value. As
+in the planner, a set-point value of zero indicates the diver is breathing
+from an open circuit system while any non-zero value indicates the use of a
+closed circuit rebreather (CCR). By right-clicking while over an existing
+marker a menu appears, adding options to allow deletion of the marker or to
+allow all markers of that type to be hidden. Hidden events can be restored
+to view by selecting Unhide all events from the context menu.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>
<div class="paragraph"><p>The Information box displays a large range of information pertaining to the
dive profile. Normally the Information Box is located to the top left of the
<strong>Dive Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong>
@@ -3015,14 +3047,16 @@ four buttons on the left of the profile panel. These are:</p></div>
<td class="icon">
<img src="images/icons/MOD.jpg" alt="Note" />
</td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum
-Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is
-dependent on the oxygen concentration in the breathing gas. For air (21%
-oxygen) it is around 57 m. Below the MOD there is a markedly increased risk
-of exposure to the dangers associated with oxygen toxicity.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
+<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum
+Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is
+dependent on the oxygen concentration in the breathing gas. For air (21%
+oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the
+<strong>Preferences</strong> section (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the
+text box <em>Max pO<sub>2</sub> when showing MOD</em>. Below the MOD there is a markedly
+increased risk of exposure to the dangers associated with oxygen toxicity.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
<table><tr>
<td class="icon">
<img src="images/icons/NDL.jpg" alt="Note" />
@@ -3114,13 +3148,13 @@ The dark green area at the bottom of the graph represents the pressures of
</p>
</li>
<li>
-<p>
-The top black horizontal line indicates the gradient factor that applies to
- the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
- appropriate gradient factor is an interpolation between the FGLow and GFHigh
- values specified in the Graph tab of the <strong>Preferences Panel</strong> of
- <strong>Subsurface</strong>.
-</p>
+<p>
+The top black horizontal line indicates the gradient factor that applies to
+ the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
+ gradient factor shown is an interpolation between the FGLow and GFHigh
+ values specified in the Graph tab of the <strong>Preferences Panel</strong> of
+ <strong>Subsurface</strong>.
+</p>
</li>
<li>
<p>
@@ -3162,9 +3196,9 @@ Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The
Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 meters. Since,
during ascent, the total inhaled gas pressure has decreased strongly from 4
bar to 1.45 bar, the pressures in the different tissue compartments now
- exceed that of the total gas pressure and approaches the gradient factor
- value (i.e. the top black horizontal line). Further ascent will result in
- exceeding the gradient factor value (GFHigh), endangering the diver.
+ exceed that of the total gas pressure and approaches the gradient factor
+ value (i.e. the top black horizontal line). Further ascent will result in
+ exceeding the gradient factor value (GFHigh), endangering the diver.
</p>
</li>
<li>
@@ -3210,9 +3244,9 @@ 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>
-is re-opened.</p></div>
-</div>
-<div class="sect3">
+is re-opened.</p></div>
+</div>
+<div class="sect3">
<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
@@ -3486,58 +3520,58 @@ below).</p></div>
</div>
<div class="paragraph"><p>A dive log or part of it can be saved in three formats:</p></div>
<div class="ulist"><ul>
-<li>
-<p>
-<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> for more
- information. UDDF is a generic format that enables communication among many
- dive computers and computer programs.
-</p>
-</li>
-<li>
-<p>
-<em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to
- <em>Divelogs.de</em>, one needs a user-ID as well as a password for
- <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em> and subscribe to this
- service in order to upload dive log data from <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<em>DiveShare</em> is also a dive log repository on the Internet focusing on the
- recreational dives. In order to upload dives one has to provide a used ID,
- so registration with <em>http://scubadiveshare.com</em> is required.
-</p>
-</li>
-<li>
-<p>
-<em>CSV dive details</em>, that includes the most critical information of the dive
- profile. Included information of a dive is: dive number, date, time, buddy,
- duration, depth, temperature and pressure: in short, most of the information
- that recreational divers enter into handwritten log books.
-</p>
-</li>
-<li>
-<p>
-<em>CSV dive profile</em>, that includes a large amount of detail for each dive,
- including the depth profile, temperature and pressure information of each
- dive.
-</p>
-</li>
-<li>
-<p>
-<em>HTML</em> format, in which the dive(s) are stored in HTML files, readable with
- an Internet browser. Most modern web browsers are supported, but JavaScript
- must be enabled. This HTML file is not intended to be edited by the users.
- The HTML dive log contains most of the information and also contains a
- search option to search the dive log. HTML export is specified on the second
- tab of the Export dialog (image <strong>B</strong> above). A typical use of this option is
- to export all one&#8217;s dives to a smartphone or a tablet where it would serve
- as a very portable record of dives useful for dive companies that wish to
+<li>
+<p>
+<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> for more
+ information. UDDF is a generic format that enables communication among many
+ dive computers and computer programs.
+</p>
+</li>
+<li>
+<p>
+<em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to
+ <em>Divelogs.de</em>, one needs a user-ID as well as a password for
+ <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em> and subscribe to this
+ service in order to upload dive log data from <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>DiveShare</em> is also a dive log repository on the Internet focusing on the
+ recreational dives. In order to upload dives one has to provide a used ID,
+ so registration with <em>http://scubadiveshare.com</em> is required.
+</p>
+</li>
+<li>
+<p>
+<em>CSV dive details</em>, that includes the most critical information of the dive
+ profile. Included information of a dive is: dive number, date, time, buddy,
+ duration, depth, temperature and pressure: in short, most of the information
+ that recreational divers enter into handwritten log books.
+</p>
+</li>
+<li>
+<p>
+<em>CSV dive profile</em>, that includes a large amount of detail for each dive,
+ including the depth profile, temperature and pressure information of each
+ dive.
+</p>
+</li>
+<li>
+<p>
+<em>HTML</em> format, in which the dive(s) are stored in HTML files, readable with
+ an Internet browser. Most modern web browsers are supported, but JavaScript
+ must be enabled. This HTML file is not intended to be edited by the users.
+ The HTML dive log contains most of the information and also contains a
+ search option to search the dive log. HTML export is specified on the second
+ tab of the Export dialog (image <strong>B</strong> above). A typical use of this option is
+ to export all one&#8217;s dives to a smartphone or a tablet where it would serve
+ as a very portable record of dives useful for dive companies that wish to
verify the dive history of a diver. This does away with the need to carry
one&#8217;s original logbook with one when doing dives with dive companies.
</p>
@@ -3596,9 +3630,9 @@ Export List only: a list of dives will only be exported and the detailed dive
Under <em>Style Options</em> some style-related options are available like font
size and theme.
</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for
+</li>
+</ul></div>
+<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for
instance <em>www.divelogs.de</em>.</p></div>
</div>
</div>
@@ -3968,104 +4002,104 @@ suivantes peuvent être réalisées :</p></div>
<div class="sectionbody">
<div class="paragraph"><p>There are several settings within <em>Subsurface</em> that the user can
specify. These are found when selecting <em>File &#8594; Preferences</em>. The settings
-are performed in five groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and
-<strong>Network</strong>. All five sections operate on the same principles: the user must
-specify the settings that are to be changed, then these changes are saved
-using the <strong>Apply</strong> button. After applying all the new settings users can then
-leave the settings panel by selecting <strong>OK</strong>.</p></div>
-<div class="sect2">
-<h3 id="_defaults">12.1. Defaults</h3>
-<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Lists and tables</strong>: Here one can specify the font type and font size of the
- <strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.
-</p>
-</li>
-<li>
-<p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one need to specify the directory and
- file name of one&#8217;s
- electronic dive log book. This is a file with filename extension .xml. When
- launched, <em>Subsurface</em> will automatically load the specified dive log book.
-</p>
-</li>
-<li>
-<p>
-<strong>Display invalid</strong>: Dives can be marked as invalid (when a user wishes to hide
- dives that he/she don&#8217;t consider valid dives, e.g. pool dives, but still want to
- keep them in the dive log). This controls whether those dives are displayed in
- the dive list.
-</p>
-</li>
-<li>
-<p>
-<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
- the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
-</p>
-</li>
-<li>
-<p>
-<strong>Animations</strong>: Some actions in showing the dive profile are performed using
- animations. For instance, the axis values for depth and time change from dive to
- dive. When viewing a different dive, these changes in axis characteristics do not
- happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled
- by setting this slider
- with faster animation speed to the left, with a 0 value representing no animation
- at all.
-</p>
-</li>
-<li>
-<p>
-<strong>Subsurface web service</strong>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
- long and hard-to-remember userID is issued. This is the place to save that userID. By
- checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
- is saved.
-</p>
-</li>
-<li>
-<p>
-<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
- cleared and set to default values.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_units">12.2. Units</h3>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
-</div>
-</div>
-<div class="paragraph"><p>Here user can choose between metric and imperial units of depth, pressure,
-volume, temperature and mass. By selecting the Metric or Imperial radio
-button at the top, users can specify that all units are in the chosen
-measurement system. Alternatively, if one selects the <strong>Personalise</strong> radio
-button, units can be selected independently, with some units in the metric
-system and others in imperial.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_graph">12.3. Graph</h3>
-<div class="imageblock" id="S_CCR_options" style="text-align:center;">
-<div class="content">
-<img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" />
-</div>
-</div>
-<div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div>
-<div class="paragraph"><p><strong>Show</strong>: Here users can specify the amount of information shown as part of
-the dive profile:
-<strong>* Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
- the dive. These are enabled using the toolbar on the left hand side of the *Dive Profile</strong>
- panel. For each of these graphs users can specify a threshold value on the right-hand side of the
- Preferences panel. If any of the graphs go above this threshold level, the graph is
- highlighted in red, indicating that the threshold has been exceeded.</p></div>
+are performed in five groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and
+<strong>Network</strong>. All five sections operate on the same principles: the user must
+specify the settings that are to be changed, then these changes are saved
+using the <strong>Apply</strong> button. After applying all the new settings users can then
+leave the settings panel by selecting <strong>OK</strong>.</p></div>
+<div class="sect2">
+<h3 id="_defaults">12.1. Defaults</h3>
+<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Lists and tables</strong>: Here one can specify the font type and font size of the
+ <strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.
+</p>
+</li>
+<li>
+<p>
+<strong>Dives</strong>: For the <em>Default Dive File</em> one need to specify the directory and
+ file name of one&#8217;s
+ electronic dive log book. This is a file with filename extension .xml. When
+ launched, <em>Subsurface</em> will automatically load the specified dive log book.
+</p>
+</li>
+<li>
+<p>
+<strong>Display invalid</strong>: Dives can be marked as invalid (when a user wishes to hide
+ dives that he/she don&#8217;t consider valid dives, e.g. pool dives, but still want to
+ keep them in the dive log). This controls whether those dives are displayed in
+ the dive list.
+</p>
+</li>
+<li>
+<p>
+<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
+ the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
+</p>
+</li>
+<li>
+<p>
+<strong>Animations</strong>: Some actions in showing the dive profile are performed using
+ animations. For instance, the axis values for depth and time change from dive to
+ dive. When viewing a different dive, these changes in axis characteristics do not
+ happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled
+ by setting this slider
+ with faster animation speed to the left, with a 0 value representing no animation
+ at all.
+</p>
+</li>
+<li>
+<p>
+<strong>Subsurface web service</strong>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
+ long and hard-to-remember userID is issued. This is the place to save that userID. By
+ checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
+ is saved.
+</p>
+</li>
+<li>
+<p>
+<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
+ cleared and set to default values.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_units">12.2. Units</h3>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
+</div>
+</div>
+<div class="paragraph"><p>Here user can choose between metric and imperial units of depth, pressure,
+volume, temperature and mass. By selecting the Metric or Imperial radio
+button at the top, users can specify that all units are in the chosen
+measurement system. Alternatively, if one selects the <strong>Personalise</strong> radio
+button, units can be selected independently, with some units in the metric
+system and others in imperial.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_graph">12.3. Graph</h3>
+<div class="imageblock" id="S_CCR_options" style="text-align:center;">
+<div class="content">
+<img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" />
+</div>
+</div>
+<div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div>
+<div class="paragraph"><p><strong>Show</strong>: Here users can specify the amount of information shown as part of
+the dive profile:
+<strong>* Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
+ the dive. These are enabled using the toolbar on the left hand side of the *Dive Profile</strong>
+ panel. For each of these graphs users can specify a threshold value on the right-hand side of the
+ Preferences panel. If any of the graphs go above this threshold level, the graph is
+ highlighted in red, indicating that the threshold has been exceeded.</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -4109,90 +4143,90 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
deepest depth of a dive. If this box is not checked, GF_Low is applied at
all depths deeper than the first deco stop. For more information see:
</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox ativated, the pO<sub>2</sub>
- graph on the dive profile has an overlay in red which inticates the CCR setpoint
- values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
-</p>
-</li>
-<li>
-<p>
-<em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub>
- values associated with each of the individual oxygen sensors of a CCR system.
- See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Configuring dive planning using rebreather equipment:</strong>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-<em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a
- CCR dive plan. This determines the pO<sub>2</sub> that will be maintained
- during a particular dive. This is the setpoint that is used at the start
- of any CCR dive. Setpoint changes during the dive can be added via the
- profile context menu.
-</p>
-</li>
-<li>
-<p>
-<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
- volume of oxygen used by a diver each minute. Set this value for pSCR dive planning
- and decompression calculations.
-</p>
-</li>
-<li>
-<p>
-<em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the
- environment to that of the gas recirculated to the diver. Set this value for a
- pSCR dive plan.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_language">12.4. Language</h3>
-<div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />
-</div>
-</div>
-<div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most
-cases will be the correct setting; with this <em>Subsurface</em> simply runs in the
-same language / country settings as the underlying OS. If this is for some
-reason undesirable users can uncheck this checkbox and pick a language /
-country combination from the list of included localizations. The <em>Filter</em>
-text box allows one to list similar languages. For instance there are
-several system variants of English or French. This particular preference
-requires a restart of <em>Subsurface</em> to take effect.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_network">12.5. Network</h3>
-<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources
-on the Internet.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
-</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox ativated, the pO<sub>2</sub>
+ graph on the dive profile has an overlay in red which inticates the CCR setpoint
+ values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
+</p>
+</li>
+<li>
+<p>
+<em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub>
+ values associated with each of the individual oxygen sensors of a CCR system.
+ See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Configuring dive planning using rebreather equipment:</strong>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a
+ CCR dive plan. This determines the pO<sub>2</sub> that will be maintained
+ during a particular dive. This is the setpoint that is used at the start
+ of any CCR dive. Setpoint changes during the dive can be added via the
+ profile context menu.
+</p>
+</li>
+<li>
+<p>
+<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
+ volume of oxygen used by a diver each minute. Set this value for pSCR dive planning
+ and decompression calculations.
+</p>
+</li>
+<li>
+<p>
+<em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the
+ environment to that of the gas recirculated to the diver. Set this value for a
+ pSCR dive plan.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_language">12.4. Language</h3>
+<div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />
+</div>
+</div>
+<div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most
+cases will be the correct setting; with this <em>Subsurface</em> simply runs in the
+same language / country settings as the underlying OS. If this is for some
+reason undesirable users can uncheck this checkbox and pick a language /
+country combination from the list of included localizations. The <em>Filter</em>
+text box allows one to list similar languages. For instance there are
+several system variants of English or French. This particular preference
+requires a restart of <em>Subsurface</em> to take effect.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_network">12.5. Network</h3>
+<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources
+on the Internet.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
+</div>
</div>
<div class="paragraph"><p>This 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
@@ -4237,52 +4271,52 @@ addition of gradient factors as implemented by Erik Baker.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
-<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user
-is already familiar with the <em>Subsurface</em> user interface. It is explicitly
-used under the following conditions:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-The user is conversant with dive planning and has the necessary training to
- perform dive planning.
-</p>
-</li>
-<li>
-<p>
-The user plans dives within his/her certification limits.
-</p>
-</li>
-<li>
-<p>
-Dive planning makes large assumptions about the characteristics of the
- <em>average person</em> and cannot compensate for individual physiology or health
- or personal history or life style characteristics.
-</p>
-</li>
-<li>
-<p>
-The safety of a dive plan depends heavily on the way in which the planner is
- used.
-</p>
-</li>
-<li>
-<p>
-The user is familiar with the user interface of <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-A user who is not absolutely sure about any of the above requirements should
- not use this feature.
-</p>
-</li>
-</ul></div>
-</div></div>
-<div class="sect2">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user
+is already familiar with the <em>Subsurface</em> user interface. It is explicitly
+used under the following conditions:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The user is conversant with dive planning and has the necessary training to
+ perform dive planning.
+</p>
+</li>
+<li>
+<p>
+The user plans dives within his/her certification limits.
+</p>
+</li>
+<li>
+<p>
+Dive planning makes large assumptions about the characteristics of the
+ <em>average person</em> and cannot compensate for individual physiology or health
+ or personal history or life style characteristics.
+</p>
+</li>
+<li>
+<p>
+The safety of a dive plan depends heavily on the way in which the planner is
+ used.
+</p>
+</li>
+<li>
+<p>
+The user is familiar with the user interface of <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+A user who is not absolutely sure about any of the above requirements should
+ not use this feature.
+</p>
+</li>
+</ul></div>
+</div></div>
+<div class="sect2">
<h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
<div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several
sections (see image below). The <strong>setup</strong> parameters for a dive are entered
@@ -4481,8 +4515,8 @@ sufficient air for buddy-sharing during the ascent.</p></div>
using multiple breathing gases. Such dives are planned in three stages:</p></div>
<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
-to the bottom left of the planning screen. Two deco models are supported the Buehlmann model and the VPM-B
-model. Select one of the two models. When selecting the Buehlmann model, the gradient factors (GF_high and GF_low
+to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
+model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
the planner), the new values are
@@ -4492,7 +4526,7 @@ A very low GFLow value brings about decompression stops early on during the dive
<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
on a scale of 0 (least conservative) to 4 (most conservative). This model
tends to give deco stops at deeper levels than the Beuhlmann model and often
-results in slightly shorter dive durations than the Buehlmann model. When
+results in slightly shorter dive durations than the Bühlmann model. When
selecting one of these models, keep in mind that they are NOT exact
physiological models but only mathematical models that appear to work in
practice.</p></div>
@@ -4511,7 +4545,7 @@ practice.</p></div>
<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco
for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
1-905492-07-3. Un excellent livre non technique qui traite à la fois des
-modèles de décompression Buehlmann et VPM-B.
+modèles de décompression Bühlmann et VPM-B.
</p>
</li>
</ul></div>
@@ -4896,66 +4930,66 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
<strong>liste des plongées</strong>.
</p>
</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la
- plongée</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte
- mondiale</strong>.
-</p>
-</li>
-<li>
-<p>
-<em>Statistiques annuelles</em> - Affiche par année le résumé des statistiques des
- plongées effectuées.
-</p>
-</li>
-<li>
-<p>
-<em>Ordinateur précédent</em> - Passer à l&#8217;ordinateur de plongée précédent.
-</p>
-</li>
-<li>
-<p>
-<em>Ordinateur suivant</em> - Passer à l&#8217;ordinateur de plongée suivant.
-</p>
-</li>
-<li>
-<p>
-<em>Plein écran</em> - Passer en mode plein écran.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_aide">14.5. Aide</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>À propos de Subsurface</em> - Affiche un panneau avec le numéro de version de
- <em>Subsurface</em> ainsi que les informations de licence.
-</p>
-</li>
-<li>
-<p>
-<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de
- Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
- <em>Subsurface</em> </a>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aidez à rendre <em>Subsurface</em> encore
- meilleur en répondant à notre sondage utilisateur.
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la
+ plongée</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte
+ mondiale</strong>.
+</p>
+</li>
+<li>
+<p>
+<em>Statistiques annuelles</em> - Affiche par année le résumé des statistiques des
+ plongées effectuées.
+</p>
+</li>
+<li>
+<p>
+<em>Ordinateur précédent</em> - Passer à l&#8217;ordinateur de plongée précédent.
+</p>
+</li>
+<li>
+<p>
+<em>Ordinateur suivant</em> - Passer à l&#8217;ordinateur de plongée suivant.
+</p>
+</li>
+<li>
+<p>
+<em>Plein écran</em> - Passer en mode plein écran.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_aide">14.5. Aide</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>À propos de Subsurface</em> - Affiche un panneau avec le numéro de version de
+ <em>Subsurface</em> ainsi que les informations de licence.
+</p>
+</li>
+<li>
+<p>
+<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de
+ Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
+ <em>Subsurface</em> </a>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aidez à rendre <em>Subsurface</em> encore
+ meilleur en répondant à notre sondage utilisateur.
</p>
</li>
<li>
@@ -5007,19 +5041,19 @@ l&#8217;ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
</div>
<div class="ulist"><ul>
<li>
-<p>
-Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
- plupart des distributions Linux le font automatiquement, de telle sorte que
- l&#8217;utilisateur n&#8217;ait rien à faire de particulier. Cependant, certains
- protocoles de communication nécessitent des pilotes additionnels, plus
- particulièrement pour certaines technologies telles que l&#8217;infra-rouge.
-</p>
-</li>
-<li>
-<p>
-Sous Windows, le bon pilote devrait être téléchargé automatiquement la
- première fois que l&#8217;utilisateur branche son ordinateur de plongée sur le
- port USB de son ordinateur de bureau.
+<p>
+Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
+ plupart des distributions Linux le font automatiquement, de telle sorte que
+ l&#8217;utilisateur n&#8217;ait rien à faire de particulier. Cependant, certains
+ protocoles de communication nécessitent des pilotes additionnels, plus
+ particulièrement pour certaines technologies telles que l&#8217;infra-rouge.
+</p>
+</li>
+<li>
+<p>
+Sous Windows, le bon pilote devrait être téléchargé automatiquement la
+ première fois que l&#8217;utilisateur branche son ordinateur de plongée sur le
+ port USB de son ordinateur de bureau.
</p>
</li>
</ul></div>
@@ -5045,70 +5079,70 @@ désactivée si aucun nom de périphérique n&#8217;est nécessaire. Dans les ra
où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
nom de votre périphérique ;</td>
</tr></table>
-</div>
-<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
-tous les périphériques COM connectés.</p></div>
-<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
-connectés.</p></div>
-<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Déconnecter le cable USB de l&#8217;ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Ouvrir un terminal
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-<li>
-<p>
-Connecter le cable USB de l&#8217;ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd
-usbcore: registered new interface driver usbserial
-USB Serial support registered for generic
-usbcore: registered new interface driver usbserial_generic
-usbserial: USB Serial Driver core
-USB Serial support registered for FTDI USB Serial Device
-ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected
-usb 2-1.1: Detected FT232BM
-usb 2-1.1: Number of endpoints 2
-usb 2-1.1: Endpoint 1 MaxPacketSize 64
-usb 2-1.1: Endpoint 2 MaxPacketSize 64
-usb 2-1.1: Setting MaxPacketSize 64
-usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3
-usbcore: registered new interface driver ftdi_sio
-ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
-</div></div>
-<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est
-détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
-utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
-que Subsurface utilise le bon port USB.</p></div>
-<div class="paragraph"><p>S&#8217;assurer que l&#8217;utilisateur possède les droits d'écriture sur le port série
-USB :</p></div>
-<div class="paragraph"><p>Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
-que par des utilisateurs membres du groupe <code>dialout</code>. Si vous n'êtes pas
-root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas
-utiliser le port USB. Si votre nom d&#8217;utilisateur est <em>johnB</em> :</p></div>
-<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
-d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>) Cela ajoute johnB au groupe
+</div>
+<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
+tous les périphériques COM connectés.</p></div>
+<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
+connectés.</p></div>
+<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Déconnecter le cable USB de l&#8217;ordinateur de plongée
+</p>
+</li>
+<li>
+<p>
+Ouvrir un terminal
+</p>
+</li>
+<li>
+<p>
+Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
+</p>
+</li>
+<li>
+<p>
+Connecter le cable USB de l&#8217;ordinateur de plongée
+</p>
+</li>
+<li>
+<p>
+Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd
+usbcore: registered new interface driver usbserial
+USB Serial support registered for generic
+usbcore: registered new interface driver usbserial_generic
+usbserial: USB Serial Driver core
+USB Serial support registered for FTDI USB Serial Device
+ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected
+usb 2-1.1: Detected FT232BM
+usb 2-1.1: Number of endpoints 2
+usb 2-1.1: Endpoint 1 MaxPacketSize 64
+usb 2-1.1: Endpoint 2 MaxPacketSize 64
+usb 2-1.1: Setting MaxPacketSize 64
+usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3
+usbcore: registered new interface driver ftdi_sio
+ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
+</div></div>
+<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est
+détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
+utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
+que Subsurface utilise le bon port USB.</p></div>
+<div class="paragraph"><p>S&#8217;assurer que l&#8217;utilisateur possède les droits d'écriture sur le port série
+USB :</p></div>
+<div class="paragraph"><p>Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
+que par des utilisateurs membres du groupe <code>dialout</code>. Si vous n'êtes pas
+root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas
+utiliser le port USB. Si votre nom d&#8217;utilisateur est <em>johnB</em> :</p></div>
+<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
+d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>) Cela ajoute johnB au groupe
<code>dialout</code>.
Tapez : <code>id johnB</code> Cela liste tous les groupes auquel johnB appartient et
vérifiez que
@@ -5712,15 +5746,15 @@ different versions of Divemanager use different methods and different file
naming conventions to export dive log data.</td>
</tr></table>
</div>
-<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
-</p>
-</li>
-<li>
-<p>
+<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
+</p>
+</li>
+<li>
+<p>
Do not start the import wizard to import dives from the dive computer.
</p>
</li>
@@ -5765,47 +5799,47 @@ Click the browse button next to the field Export Path
</p>
<div class="ulist"><ul>
<li>
-<p>
-A file-manager like window pops up
-</p>
-</li>
-<li>
-<p>
-Navigate to the directory for storing the
- Divelog.SDE file
-</p>
-</li>
-<li>
-<p>
-Optionally change the name of the file for saving
-</p>
-</li>
-<li>
-<p>
-Click <em>Save</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Back in the Export pop-up, press the button <em>Export</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-The dives are now exported to the file Divelog.SDE.
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>
-<div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs. To export a
-divelog from Divemanager one needs to locate the DM4/DM5 database where the
-dives are stored. the user can either look for the original database or make
-a backup of the dives. Both methods are described here.</p></div>
-<div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>
+<p>
+A file-manager like window pops up
+</p>
+</li>
+<li>
+<p>
+Navigate to the directory for storing the
+ Divelog.SDE file
+</p>
+</li>
+<li>
+<p>
+Optionally change the name of the file for saving
+</p>
+</li>
+<li>
+<p>
+Click <em>Save</em>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Back in the Export pop-up, press the button <em>Export</em>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+The dives are now exported to the file Divelog.SDE.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>
+<div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs. To export a
+divelog from Divemanager one needs to locate the DM4/DM5 database where the
+dives are stored. the user can either look for the original database or make
+a backup of the dives. Both methods are described here.</p></div>
+<div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -6040,8 +6074,8 @@ file type and select the option <em>Edit filter settings</em>.</p></div>
<div class="content">
<img src="images/LOffice_save_as_options.jpg" alt="FIGURE: Save as options" />
</div>
-</div>
-<div class="paragraph"><p>After selecting <em>Save</em>, select the appropriate field delimiter (choose <em>Tab</em>
+</div>
+<div class="paragraph"><p>After selecting <em>Save</em>, select the appropriate field delimiter (choose <em>Tab</em>
to prevent conflicts with the comma when using this as a decimal point),
then select <em>OK</em>.</p></div>
<div class="imageblock" style="text-align:center;">
@@ -6067,9 +6101,9 @@ outlined below.</p></div>
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>
-</li>
-<li>
-<p>
+</li>
+<li>
+<p>
Open the <em>Regional and Language Options</em> dialog box.
</p>
</li>
@@ -6109,9 +6143,9 @@ top left, then <em>Save As</em>.</p></div>
<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the
right-hand. This brings up a dialogue for saving the spreadsheet in an
alternative format. From the dropdown list at the bottom of the dialogue,
-marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Ensure that
-the appropriate folder has been selected to save the CSV file into.</p></div>
-<div class="imageblock" style="text-align:center;">
+marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Ensure that
+the appropriate folder has been selected to save the CSV file into.</p></div>
+<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />
</div>
@@ -6489,16 +6523,16 @@ end pressure)</code></p></div>
theory. But an "ideal gas" doesn&#8217;t actually exist, and real gases actually
don&#8217;t compress linearly with pressure. Also, you are missing the fact that
one atmosphere of pressure isn&#8217;t actually one bar. So the <strong>real</strong>
-calculation is:</p></div>
-<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
-<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
+calculation is:</p></div>
+<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
+<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
It&#8217;s a combination of: "take compressibility into account" (which is a
fairly small issue under 220 bar - you&#8217;ll see more differences when you do
high-pressure tanks with 300bar) and "convert bar to atm" (which is the
majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without
-the compressibility, your gas use is:</p></div>
-<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
-<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple
+the compressibility, your gas use is:</p></div>
+<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
+<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple
calculation that ignored the difference between 1 bar and one ATM. The
compressibility does show up above 200 bar, and takes that 1445 down about
eight litres more, so you really did use only about 1437 l of air at surface
@@ -6549,7 +6583,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-15 10:11:12 CEST
+Last updated 2015-09-18 16:34:13 CEST
</div>
</div>
</body>