From dd0c995f2fc4496bcdf31962d3a3c823baf79591 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 25 Mar 2014 08:16:06 -0700 Subject: [PATCH] User manual: Update included .html.git file Signed-off-by: Dirk Hohndel --- Documentation/user-manual.html.git | 250 ++++++++++++++--------------- 1 file changed, 120 insertions(+), 130 deletions(-) diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git index 60e1af6ba..b7a5b2cd4 100644 --- a/Documentation/user-manual.html.git +++ b/Documentation/user-manual.html.git @@ -524,7 +524,7 @@ saved before a new logbook is created.

-

3. How to obtain dive information to store in the user’s logbook

+

3. How to store dive information in the user’s logbook

There are several ways in which dive information can be added to a logbook:

    @@ -581,14 +581,14 @@ fields are visible:

FIGURE: The Dive Notes tab
-

The Starttime field reflects the date and the time of the dive. By clicking +

The Start time field reflects the date and the time of the dive. By clicking the down-arrow on the right of that field a calendar will be displayed from which one can choose the correct date. 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.

Air and water temperatures: the air and water temperatures during the -dive can be typed directly on the fields to the right of the Starttime. +dive can be typed directly on the fields to the right of the Start time. Temperature units are not needed, as they will be automatically supplied by Subsurface. Only the numerical value must be typed by the user (The units selected in the Preferences @@ -605,7 +605,7 @@ here. These can come from three sources:

One can find the coordinates on the world map in the bottom right hand part of the Subsurface window. The map displays a green bar indicating "No location -data - Move the map double-click to set the location". Upon a double-click +data - Move the map and double-click to set the dive location". Upon a double-click at the appropriate place, the green bar disappears and the coordinates are stored.

@@ -635,9 +635,9 @@ Decimal degrees, e.g. 30.22496 , 30.821798

Southern hemisphere latitudes are given with a S, e.g. S30°, or with a negative value, e.g. -30.22496. Similarly western longitudes are given with a W, e.g. W07°, or with a negative value, e.g. -7.34323.

-

Please note that GPS coordinates of a dive site a linked to the Location -name - so adding coordinates to dives that don’t have a location set will -caused unexpected behavior (as Subsurface will think that all of these +

Please note that GPS coordinates of a dive site are linked to the Location +name - so adding coordinates to dives that does not have a location description +will cause unexpected behavior (Subsurface will think that all of these dives have the same location and try to keep their GPS coordinates the same.

Divemaster: The name of the dive master or dive guide for this dive can be @@ -646,13 +646,12 @@ Again, this field offers auto completion based on the list of dive masters in the current logbook.

Buddy: In this field one can enter the name(s) of the buddy / buddies (separated by commas) who accompanied the user on the dive. Auto completion -based on the list of buddies in the current logbook is offered.

-

Suit: The type of diving suit that was used for the dive can be entered here. -Just as with the -other items, auto completion of the suit description is available.

-

Rating: In this field, users can provide a subjective overall rating of the +is offered based on the list of buddies in the current logbook.

+

Suit: The type of diving suit used for the dive can be entered here. +As with the other items, auto completion of the suit description is available.

+

Rating: In this field, provide a subjective overall rating of the dive on a 5-point scale by clicking the appropriate star on the rating scale.

-

Visibility: As with the previous item, users can provide a rating of +

Visibility: As with the previous item, provide a rating of visibility during the dive on a 5-point scale by clicking the appropriate star.

Tags: Tags that describe the type of dive performed may be entered here (separated by commas). Examples of common tags are boat, drift, @@ -696,25 +695,26 @@ like this:

dive. The dark dustbin icon on the left allows one to delete information for a particular cylinder.

-

The user starts by selecting a cylinder type on the left-hand side of the -table. To select a cylinder, the user must click in the cylinder type box. -This brings up a list button that can be used to display a dropdown list of +

Start by selecting a cylinder type on the left-hand side of the +table. To select a cylinder, click in the Type box. +This brings up a button that can be used to display a dropdown list of cylinders:

FIGURE:The cylinder drop-down list button
-

This drop-down list can then be used to select the cylinder type that was used -for this dive. The +

The drop-down list can be used to select the cylinder type used +for the dive or the user may start typing in the box which shows the +available options for the entered characters. The Size of the cylinder as well as its working pressure (WorkPress) will -automatically be shown in the dialogue.

-

Next, the user must indicate the starting pressure and the ending pressure of +automatically be shown in the dialogue. If a cylinder is not shown in the dropdown list, type the name and description of that cylinder into the Type field.

+

Next, indicate the starting pressure and the ending pressure of the gas used during the dive. The unit of pressure (metric/imperial) corresponds -to the setting in the preferences.

-

Finally, the user should type in the gas mixture used. If air -was used, a value of 21% can be entered on this field, or the field might be +to the setting in the Preferences.

+

Finally, type in the gas mixture used in the O2% field. If air +was used, a value of 21% can be entered on this field, or it might be left blank. If nitrox or trimix were used, their percentages of oxygen and/or helium must be specified. Any inappropriate fields should be left empty. After typing the information for @@ -729,7 +729,7 @@ dive made using two cylinders (air and EAN50):

Weights: Information about the weight system used during a dive can be entered -using a dialogue very similar to that of the cylinder information. If the user +using a dialogue very similar to that for the cylinder information. If the user clicks the + button on the top right of the weights dialogue, the table looks like this:

@@ -744,7 +744,8 @@ through a down-arrow:

FIGURE: Weights type drop-down list button
-

This drop-down list can then be used to select the type of weight system. In +

The drop-down list can then be used to select the type of weight system or the user may start +typing in the box which shows the available options for the entered characters. In the Weight field, the weight used during the dive must be typed. After typing the information @@ -761,7 +762,7 @@ with two types of weights: integrated and a weight belt:

There’s NO need to click the Save button before the dive -profile has beeb completed.

+profile has been completed.

3.1.3. Creating a Dive Profile

@@ -776,20 +777,21 @@ dive being described:

Modifying the dive profile: When the cursor is moved around the dive profile, -its position is indicated by two red lines as shown below. The depth and time +its position is indicated by two colored lines (red and green) as shown below. +The depth and time that the cursor represents are indicated, respectively on the left hand and bottom axes. The units (metric/imperial) on the axes are determined by the -preference settings. The dive profile itself comprises several +Preference 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 21 m then the user needs to drag the appropriate waypoints downwards to represent 21 m. To add a waypoint, double-click on -any line segment. -To remove a waypoint, right-click on it and choose "Remove this point" from the -context menu. The user will also need to drag the waypoints to represent an +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 21 m for 31 min, followed by a 3 minute safety stop at 5 m.

+to 21 m for 31 min, followed by a 5 minute safety stop at 5 m.

FIGURE: Edited dive profile @@ -799,20 +801,20 @@ to 21 m for 31 min, followed by a 3 minute safety stop at 5 m.

along the line segments of the dive profile. This defaults to the first gas mixture specified in the Equipment 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 clicking on the particular +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 to the left of that waypoint. Note that only the gases defined in the Equipment tab appear in the -context menu:

+context menu.

FIGURE: Gas composition context menu
-

Below is the profile of a dive to 21 m for 31 min with a switch from air to -EAN40 on the ascent. In this case the first cylinder in the Equipment tab -contained air and the second cylinder contained EAN40.

+

Below is the profile of a dive to 21 m for 31 min for which an extra waypoint was added at 18 m on the ascent and with a switch from air to +EAN50 at 18 m. In this case the first cylinder in the Equipment tab +contained air and the second cylinder contained EAN50.

FIGURE: Completed dive profile @@ -828,7 +830,7 @@ on the top right hand of the Dive Notes tab. If the Save button is clic the dive data are saved in the current logbook. If the Cancel button is clicked, the newly entered -dive data are discarded. When exiting Subsurface the user will be prompted +dive data are discarded. When exiting Subsurface, the user will be prompted once more to save the logbook with the new dive(s).

@@ -855,9 +857,9 @@ PC-Communication mode. This could drain the dive computer’s batter therefore recommend that the user checks if the dive computer is charged when connected to the USB port of a PC. For example, several Suunto and Mares dive -computers do not recharge through the USB connection. The users should refer to +computers do not recharge through the USB connection. Users should refer to the dive computer’s manual -if they are unsure whether the dive computer will recharge or drain its batteries +if they are unsure whether the dive computer recharges its batteries while connected to the USB port. @@ -907,13 +909,13 @@ though these dives have already been imported to Subsurface. For that r 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 the the check box labeled -Force download of all dives can be ticked.

+even though some may already be in the logbook, then check the the check box labeled +Force download of all dives.

  • The dialogue has two drop-down lists, Vendor and Dive Computer. On the -vendor drop-down list the user must select the make of the computer, e.g. +vendor drop-down list select the make of the computer, e.g. Suunto, Oceanic, Uwatec, Mares. On the Dive Computer drop-down list, the model name of the dive computer must be selected, e.g. D4 (Suunto), Veo200 (Oceanic), or Puck @@ -978,10 +980,10 @@ 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 Dive List, sorted by date and time. Disconnect and +in the Dive List, sorted by date and time. Disconnect and switch off the dive computer to conserve its battery power. -If a particular dive is selected, the Dive Profile panel shows an informative +If a particular dive is selected, the Dive Profile panel shows an informative graph of dive depth against time for that particular dive.

    • @@ -1010,7 +1012,7 @@ software? Has it worked before, or is this the first time the cable is being use 4) Consult Appendix A and make sure that the correct Mount Point was specified (see above). 5) On Unix-like operating systems, does the user have write permission to the -USB port? If not, users should consult Appendix A. +USB port? If not, consult Appendix A.

If the Subsurface computer does not recognise the USB adaptor by @@ -1025,13 +1027,14 @@ two check boxes checked in the download dialogue discussed above:

Save libdivecomputer logfile
 Save libdivecomputer dumpfile
-

Important: These check boxes are only used when problems are ancountered +

Important: These check boxes are only used when problems are encountered during the download process: under normal circumstances they should not be checked. When checking these boxes, the user is prompted to select a folder to save the information to. The default folder is the one in which the Subsurface -dive log is kept. Important: After downloading with the above checkboxes -checked, no dives are shown in the -Dive List but two files are created in the folder selected above:

+dive log is kept.

+

Important: After downloading with the above checkboxes +checked, no dives are added to the +Dive List but two files are created in the folder selected above:

subsurface.log
@@ -1039,7 +1042,7 @@ subsurface.bin

These files should be send to the Subsurface mail list: subsurface@hohndel.org with a -request for the files to be analysed. One should provide the dive computer +request for the files to be analysed. Provide the dive computer make and model as well as contextual information about the dives recorded on the dive computer.

@@ -1047,14 +1050,14 @@ as well as contextual information about the dives recorded on the dive computer.

3.2.2. Updating the dive information imported from the dive computer.

The information from the dive computer is not complete and more -details must be added in order to have a more complete record of the dives. To +details must be added in order to have a more full record of the dives. To do this, the Dive Notes and the Equipment tabs on the top left hand of the Subsurface window should be used.

3.2.3. Dive Notes

-

The date and time of the dive, gas mixture and perhaps water temperature is +

The date and time of the dive, gas mixture and (often) water temperature is shown as obtained from the dive computer, but the user needs to add some additional information by hand in order to have a more complete dive record. The message in a blue box at @@ -1066,14 +1069,14 @@ visible:

FIGURE: The Dive Notes tab
-

The Starttime field reflects the date and the time of the dive, as supplied by +

The Start time field reflects the date and the time of the dive, as supplied by the dive computer. It should therefore not be necessary to edit this, but one could make changes by clicking the down-arrow on the right of that field to display a calendar from which the correct date can be chosen. The hour and minutes values can also be edited by clicking on each of them in the text box and by overtyping the information displayed.

Air/water temperatures: Air and water temperatures during the dive are shown -in these fields to the right of the Starttime. Many dive computers supply water +in these fields to the right of the Start time. Many dive computers supply water temperature information and this field may therefore not require further editing. If editing is required, only a value is required. The units of temperature will be @@ -1081,10 +1084,7 @@ automatically supplied by Subsurface (according to the Preferences, metric or imperial units will be used).

Location: In this field one should type in text that describes the site -where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary". the required drivers to interact with the download cable and connected dive -computer.

-

If all the above points are in order and there is a failure to download the -dive +where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary". Auto completion of location names will make this easier when a user frequently dives at the same sites.

Coordinates: The geographic coordinates of the dive site should be entered @@ -1094,8 +1094,8 @@ here. These can come from three sources:

The user can find the coordinates on the world map in the bottom right hand part -of the Subsurface window. The map displays a green bar indicating "No location -data - move the map and double-click to set the location". Double-click +of the Subsurface window. The map displays a green bar indicating "Move the map +and double-click to set the dive location". Double-click at the appropriate place, the green bar disappears and the coordinates are stored.

@@ -1123,11 +1123,11 @@ Decimal degrees, e.g. 30.22496 , 30.821798

Southern hemisphere latitudes are given with a S, e.g. S30°, or with a -negative value, e.g. -30.22496. Similarly western longitudes are given with a +negative value, e.g. -30.22496. Similarly, western longitudes are given with a W, e.g. W07°, or with a negative value, e.g. -7.34323.

Divemaster: The name of the dive master or dive guide for this dive should be -entered in this field. -This field offers auto completion based on the list of dive masters in +entered in this field +which offers auto completion based on the list of dive masters in the current logbook.

Buddy: In this field, one enters the name(s) of the buddy / buddies (separated with commas) who accompanied him/her on the @@ -1194,14 +1194,15 @@ cylinders:

The drop-down list can then be used to select the cylinder type that was used -for this dive. The +for this dive or the user may start typing in the box which shows the available +options for the entered characters. The Size of the cylinder as well as its working pressure (WorkPress) will automatically be shown in the dialogue.

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 preferences.

-

Finally, the user must type in the gas mixture used. If air was used, the -value of 21% can be entered here or this field can be left blank. If nitrox or +corresponds to the settings chosen in the Preferences.

+

Finally, the user must 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, @@ -1233,7 +1234,9 @@ down-arrow:

The drop-down list can then be used to select the type of weight system -used during the dive. In the Weight +used during the dive or the user may start typing in the box +which shows the available options for the entered characters. +In the Weight field, type in the amount of weight used during the dive. After specifying the weight system, the user can either press ENTER on the keyboard or click outside the @@ -1242,7 +1245,7 @@ It is possible to enter information for more than one weight system by adding an additional system using the + button on the top right hand. Weight systems can be deleted using the dustbin icon on the left hand. Here is an example of information for a dive -with two types of weights: integrated and a weight belt:

+with two types of weights: integrated as well as a weight belt:

FIGURE: A completed weights information table @@ -1252,7 +1255,7 @@ with two types of weights: integrated and a weight belt:

3.2.5. Saving the updated dive information

The information entered in the Dive Notes tab and the Equipment tab can be -saved with all the other information of the dives in the user’s logbook by +saved by using the two buttons on the top right hand of the Dive Notes tab. If the Save button is clicked, @@ -1265,13 +1268,13 @@ that the new data should be saved.

3.3. Importing dive information from other digital data sources or other data formats

-

If a user has been diving for some time, it’s possible that several dives were -logged using other dive log software. All this information needs not -be typed by hand into Subsurface, because these divelogs can probably be +

If a user has been diving for some time, it is possible that several dives were +logged using other dive log software. This information does not need retyping +because these divelogs can probably be imported onto Subsurface. Subsurface will import divelogs from a range of other dive log software. While some software is supported natively, for others the -user will have to +user has to export the logbook(s) to an intermediate format so that they can then be imported by Subsurface. Currently, Subsurface supports importing CSV log files from several sources. @@ -1280,7 +1283,7 @@ preconfigured, but because the import is flexible, users can configure their own imports. Manually kept log files (e.g. in spreadsheet) can also be imported by configuring the CSV import. -Subsurface can also import UDDF and UDCF files that are used by some divelog +Subsurface can also import UDDF and UDCF files used by some divelog software and some divecomputers, like the Heinrichs & Weikamp DR5. Finally, for some divelog software like Mares Dive Organiser it is currently suggested to import the logbooks first into a webservice like divelogs.de and then import @@ -1308,12 +1311,12 @@ available, as in dialogue B, above. Currently these are:

  • -XML-formatted dive logs +XML-formatted dive logs (Divinglog 5.0, MacDive and several other dive log systems)

  • -UDDF-formatted dive logs +UDDF-formatted dive logs (e.g. Kenozoooid)

  • @@ -1333,27 +1336,12 @@ Suunto Dive Manager (DM3 and DM4)

  • -MacDive (XML) -

    -
    • -
  • -

    -DivingLog 5.0 (XML) -

    -
    • -
  • -

    -Kenozooid (UDDF) -

    -
    • -
  • -

    CSV (text-based and spreadsheet-based) dive logs.

Selecting the appropriate file in the file list of the dialogue opens -the imported dive log in the Subsurface Dive List. A few other formats, not +the imported dive log in the Subsurface Dive List. Some other formats, not accessible through the Import dialogue are also supported, as explained below.

@@ -1362,15 +1350,14 @@ accessible through the Import dialogue are also supported, as explained below.Subsurface. Mares dive logs need to be imported using a three-step process, -using www.divelogs.de as a mechanism to extract the dive information from -the file.

+using www.divelogs.de as a mechanism to extract the dive log information.

  • The dive log data from Mares Dive Organiser need to be exported to the user’s desktop, using - a .sdf file name extension. Refer to Appendix -C for more information. + a .sdf file name extension. Refer to Appendix C for more +information.

  • @@ -1400,7 +1387,7 @@ brings up a dialogue box (see figure on left [A] below). Enter user-ID and password for divelogs.de into the appropriate fields and then select the Download button. Download from divelogs.de starts immediately, -displaying a progress bar in the dialogue box. At the and of the download, the +displaying a progress bar in the dialogue box. At the end of the download, the success status is indicated (see figure on the right [B], below). The Apply button should then be selected, after which the imported dives appear in the Subsurface Dive List panel.

@@ -1414,8 +1401,8 @@ success status is indicated (see figure on the right [B], below

3.3.4. Importing dives in CSV format

Sometimes dive computers export dive information as files with comma-separated values (.CSV). For example, the APD Inspiration and Evolution -closed circuit rebreather (CCR) systems export dive information in CSV format -that normally contains information about a single dive only. These +closed circuit rebreather (CCR) systems export dive information in a CSV +formatted file that normally contains information for a single dive only. These files can easily be imported into Subsurface. CSV files are normally organised into a single line that provides the headers of the data columns, followed by the @@ -1452,14 +1439,14 @@ 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, +the numbers are aligned in columns, the file is probably TAB-delimited (i.e. it uses a TAB as a field separator, as in the above example).

  • -Which data columns need to be imported into Subsurface?. The Dive Time and +Which data columns need to be imported into Subsurface? The Dive Time and Depth columns are always required. Open the file using a text editor and note the titles of the columns to be imported and their column positions. For instance for the above example: @@ -1476,7 +1463,7 @@ ppO2: column 4

    Armed with this information, importing the data into Subsurface is straightforward. Select Import→Import Log Files from the main menu. In the resulting file -selection menu, select oa CSV files, after which a common configuration dialog +selection menu, select CSV files, after which a common configuration dialog appears for all the files with a CSV extension:

    @@ -1487,7 +1474,7 @@ files with a CSV extension:

    There are pre-configured definitions for some dive computers, e.g. the APD rebreathers. If the user’s dive computer is on this list, it should be selected using the dropdown -box labeled Pre-configured imports. Finally the OK should be clicked and +box labeled Pre-configured imports. Finally OK should be clicked and the dive will be imported and listed in the Dive List tab of Subsurface.

    If the dive computer is not on the pre-configured list, the user must select the Field @@ -1498,7 +1485,7 @@ variables. For each data column used for import, the user must check the appropriate check box and indicate in which column these data are found. For instance, the image above corresponds to the dialogue that would apply to the CSV data set described above -the image. Having performed the column specification, select the OK button +the image. After completing the column specification, select the OK button and the dive will be imported and listed in the Dive List tab of Subsurface.

    • @@ -1524,18 +1511,19 @@ the data are in clear columns, the file is probably TAB-delimited (i.e. it uses a TAB as a field separator, as in the above example). -A recommended field separator for the export is tab, as commas might be used in +A recommended field separator for the export is tab, as commas might be part of the -field values themselves. +field values themselves. Therefore the use of an appropriate field separator +in very important.

  • -Which columns need to be imported into Subsurface?. We do not +Which columns need to be imported into Subsurface? We do not currently have any mandatory input fields, but some, e.g. dive duration are crucial for the log file to make any sense. Possible options can be seen in the image below and one should include all the -fields available in both your log file and in the Subsurface +fields available in both your log file and in the Subsurface import.

    • @@ -1543,16 +1531,16 @@ import.

    Units used for depth, weight and temperature. We consider depth to be either feet or meters, weight kilograms or pounds and temperature either -Celsius or Fahrenheit. However, the users can only select Metric or -Imperial in the Preferences tab of Subsurface.. No mixture of unit s -ystems is allowed for the different fields. +Celsius or Fahrenheit. However, the users can select Metric or +Imperial in the Preferences tab of Subsurface. No mixture of unit +systems is allowed for the different fields.

    Importing manually kept CSV log files is quite straight forward, but there might be many fields and counting the field numbers is error prone. Therefore validation of the data to be imported is critical.

    -

    To import the dives, one must select Import→Import Log Files from the menu +

    To import the dives, select Import→Import Log Files from the menu bar. If the CSV option in the dropdown list is selected and the file list includes file names ending with .CSV, one can select the Manual dives tab that will bring up the following configuration dialog:

    @@ -1567,17 +1555,19 @@ appear in the Dive List area of Subsurface.

    -

    3.4. Importing GPS coordinates with the Subsurface Companion app for mobile

    -

    phones -If the user has an Android device with GPS, the coordinates for the diving -location can be obtained and automatically passed to Subsurface -divelog. To do this, one needs to:

    +

    3.4. Importing GPS coordinates with the Subsurface Companion App for mobile phones

    +

    If the user has an Android device with GPS, the coordinates for the diving +location can be obtained and automatically passed to the Subsurface +divelog. This takes place when the Companion App stores the dive locations on +a dedicated Internet-based file server. Subsurface, in turn, can collect +the localities from the file server.

    +

    To do this, one needs to:

    • Register on the Subsurface companion web page. A confirmation mail with instructions and a personal DIVERID will be send together with -a long number that gives access to the companion app capabilities. +a long number that gives access to the file server and Companion App capabilities.

    • @@ -1615,14 +1605,14 @@ option (see below).

    Now one is ready to get a dive position and send it to the server. The Android -display will look like the left hand image (A) below, but without any dive.

    -

    Touching the "+" icon on the top right to add a new dive site. Users will be -prompted for a place name (or asked to activate the GPS if it was turned off). +display will look like the left hand image (A) below, but without any dive.

    +

    Touch the "+" icon on the top right to add a new dive site. Users will be +prompted for a place name (or asked to activate the GPS if it is turned off). The main screen shows a list of dive locations, each with a name, date and time. Some dives may have an arrow-up icon on the selection box to the left (see image B in the middle, below) indicating that they require upload to the server.

    There are several ways to send dives to the server; the easiest is by simply -selecting the dive. See middle image below (B):

    +selecting the dive. See middle image below (B):

    FIGURE: Screen shots (A-C) of companion app @@ -1641,10 +1631,10 @@ it deletes the dive location(s).

    The new dive points are now stored on the server and can be downloaded to the Subsurface dive log whenever users upload or add dives to Subsurface. After a dive trip using the Companion app, all dive locations are ready to be -saved on a Subsurface dive log (see below).

    +saved on a Subsurface dive log (see below).

    Settings on the Companion app
    -

    Selecting the Settings menu option results in the right hand image above ©.

    +

    Selecting the Settings menu option results in the right hand image above (C).

    Server and account
    @@ -1762,7 +1752,7 @@ of another registered diver.

    -

    3.4.2. Downloading dive locations to a Subsurface divelog

    +

    3.4.2. Downloading dive locations to the Subsurface divelog

    Download dive(s) from a dive computer or enter them manually into Subsurface before obtaining the GPS coordinates from the server. The download dialog can be reached via Ctrl+G or from the Subsurface Main Menu Import @@ -1784,7 +1774,7 @@ date-times of the uploaded GPS localities.

    Note -Features, issues and tips._ Since Subsurface matches GPS locations from the +Features, issues and tips. Since Subsurface matches GPS locations from the Android device and dive information from the dive computer based on date-time data, automatic assignment of GPS data to dives is dependent on agreement of date and time between these two devices. If there is a large difference between @@ -2428,7 +2418,7 @@ the output for one particular page.

    -

    8. Setting user Preferences for Subsurface

    +

    8. Setting user Preferences for Subsurface

    There are several settings within Subsurface that the users can specify. These are found when selecting File→Preferences. The settings are performed in @@ -3427,7 +3417,7 @@ you may stay in the water for a long time, but spend most of it at the surface.