From 4cb80986fcb89392db9137938448ac9ec41a2b25 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 30 Jul 2014 14:29:42 -0700 Subject: [PATCH] Once again, add latest html documentation files to git Signed-off-by: Dirk Hohndel --- Documentation/user-manual.html.git | 267 ++++++++++++++++---------- Documentation/user-manual_es.html.git | 166 +++++++++++----- 2 files changed, 280 insertions(+), 153 deletions(-) diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git index 7217ff858..b45c44cbb 100644 --- a/Documentation/user-manual.html.git +++ b/Documentation/user-manual.html.git @@ -410,10 +410,10 @@ asciidoc.install(3);

USER MANUAL

Manual authors: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat

-

Version 4.2, July 2014

-

Welcome as a user of Subsurface, an advanced dive logging programme with +

Version 4.2, August 2014

+

Welcome as a user of Subsurface, an advanced dive logging program with extensive infrastructure to describe, organise, interpret and print scuba -and free dives. Subsurface offers many advantages above other similar +and free dives. Subsurface offers many advantages over other similar software solutions:

  • @@ -429,13 +429,13 @@ Do you use two different dive computer brands, each with its own proprietary

  • Do you use more than one operating system? Subsurface is fully compatible - with Mac, Linux and Microsoft, allowing you to access your dive log on each - of your operating systems in a unified way. + with Mac, Linux and Windows, allowing you to access your dive log on each + of your operating systems with a single application.

  • -Do you use Linux or Mac and your dive computer has only Microsoft-based software +Do you use Linux or Mac and your dive computer has only Windows-based software for downloading dive information (e.g. Mares)? Subsurface provides a way of storing and analysing your dive logs on other operating systems.

    @@ -472,7 +472,7 @@ The Dive List to the bottom left containing a list of all the d user’s dive log. A dive can be selected and highlighted on the dive list by clicking on it. In most situations the up/down keys can be used to switch -between dives. The Dive List is an important tool for manipulating a dive log. +between dives. The Dive List is an important tool for manipulating a dive log.

  • @@ -496,10 +496,10 @@ selected dive in the Dive List.

-

The dividers can be dragged between panels in order to change the size of any of +

The dividers between panels can be dragged in order to change the size of any of the panels. Subsurface remembers the position of the dividers, so the next -time Subsurface starts it uses the positions of the dividers when the program -was executed previously.

+time Subsurface starts it uses the positions of the dividers from when the program +was last used.

If a dive is selected in the Dive List, the dive location, detailed information and profile of the selected dive are shown in the respective panels. On the other hand, if @@ -522,8 +522,7 @@ display:

all highlighted dives.

Globe: Show only the world map, centred on the last selected dive.

Like many other functions that can be accessed via the Main Menu, these options -can be triggered using keyboard shortcuts. The shortcuts for a -particular system +can be triggered using keyboard shortcuts. The shortcuts for a particular system are shown with an underline in the main menu entries. Since different Operating Systems and the user chosen language may cause Subsurface to use different shortcut keys they are not listed here in the user manual.

@@ -577,8 +576,8 @@ depth, the names of your dive buddy and of the dive master or dive guide, and some remarks about the dive. Subsurface can store much more information than this for each dive. In order to add a dive to a dive log, select Log → Add Dive from the Main Menu. The program then shows three panels to enter -information for a dive: two tabs in the Info panel (Dive Notes and -Equipment), as well as the profile panel that displays a graphical profile +information for a dive: two tabs in the Dive Info panel (Dive Notes and +Equipment), as well as the Dive Profile panel that displays a graphical profile of each dive. These panels are respectively marked A, B and C in the figure below. Each of these tabs will now be explained for data entry.

@@ -654,10 +653,10 @@ Decimal degrees, e.g. 30.22496 , 30.821798 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 are linked to the Location -name - so adding coordinates to dives that does not have a location description +name - so adding coordinates to dives that do not have a location description will cause unexpected behaviour (Subsurface will think that all of these dives have the same location and try to keep their GPS coordinates the -same.

+same).

Divemaster: The name of the dive master or dive guide for this dive can be entered here. Again, this field offers auto completion based on the list of dive masters in @@ -666,15 +665,18 @@ the current logbook.

(separated by commas) who accompanied the user on the dive. Auto completion 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, provide a rating of -visibility during the dive on a 5-point scale by clicking the appropriate star.

+As with the other items, auto completion of the suit description is available. +Some dry-suit users may choose to use this field to record what combination of +suit and thermal protection undersuit was used.

+

Rating: One can provide a subjective overall rating of the dive on a +5-point scale by clicking the appropriate star on the rating scale.

+

Visibility: Similarly, one can 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, training, cave etc. Subsurface has many built-in tags. Auto completion is once again offered. -For instance, if, for instance, cav was typed, then the tags cave and cavern are +For instance, if cav was typed, then the tags cave and cavern are shown for the user to choose from.

Notes: Any additional information can be typed here.

The Save and Cancel buttons are used to save all the information for tabs in @@ -1103,8 +1105,8 @@ as well as contextual information about the dives recorded on the dive computer. upload dive logs to Subsurface. For instance if one’s partner’s dive computer is the same make and model as one’s own and dive logs are uploaded from both dive computers to the same Subsurface computer, then -one would perhaps like to call one dc "Annie’s Suunto D4" and the other one -"John’s Suunto D4". Alternatively, perhaps a technical diver dives with two or more +one would perhaps like to call one dc "Alice’s Suunto D4" and the other one +"Bob’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 Subsurface. @@ -1117,7 +1119,7 @@ allowing easy identification of devices.

3.2.3. 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 full record of the dives. To +details must be added in order to have a fuller 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.

@@ -1136,9 +1138,9 @@ visible:

FIGURE: The Dive Notes tab -

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

The Time field reflects the date and time of the dive. By clicking the date, a calendar is displayed from which -one can choose the correct date. Press ESC to escape from the calendar. +one can choose the correct date. Press ESC to close the calendar. The time values (hour and minutes) can also be edited directly by clicking on each of them in the text box and by overtyping the information displayed.

@@ -1146,7 +1148,7 @@ information displayed.

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 +editing is required, only a value is required, the units of temperature will be automatically supplied by Subsurface (according to the Preferences, metric or imperial units will be used).

@@ -1192,6 +1194,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 W, e.g. W07°, or with a negative value, e.g. -7.34323.

+

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

Divemaster: 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 @@ -1201,7 +1208,9 @@ the current logbook.

dive. Auto completion based on the list of buddies in the current logbook is offered.

Suit: Here the type of diving suit used for the dive can be entered. -Auto completion of the suit description is available.

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

Rating: One can provide a subjective overall rating of the dive on a 5-point scale by clicking the appropriate star on the rating scale.

Visibility: Similarly, one can provide a rating of visibility during the @@ -1375,7 +1384,7 @@ that the new data should be saved.

If a user has been diving for some time, it is possible that several dives were logged using other dive log software. This information does not need retyping because these dive logs can probably be -imported onto Subsurface. Subsurface will import dive logs from a range of +imported into Subsurface. Subsurface will import dive logs from a range of other dive log software. While some software is supported natively, for others the user has to @@ -1450,7 +1459,7 @@ accessible through the Import dialogue are also supported, as explained below.

3.3.2. Importing from Mares Dive Organiser V2.1

-

Since Mares utilise proprietary Microsoft software not compatible with +

Since Mares utilise proprietary Windows software not compatible with multi-platform applications, these dive logs cannot be directly imported into Subsurface. Mares dive logs need to be imported using a three-step process, @@ -1732,7 +1741,7 @@ This facilitates synchronisation between Subsurface and the Companion A

Creating new dive locations

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.

+display will look like the left hand image (A) below, but without any dives.

Touch the "+" icon on the top right to add a new dive site, a menu will be showed with 3 options:

    @@ -1821,7 +1830,7 @@ top right of the screen.

Important -Users must be careful, as the trash icon on the right means exactly what it should: +Users must be careful, as the trash icon on the right means exactly what it should; it deletes the selected dive location(s).
@@ -1855,12 +1864,12 @@ course, users can also type this information.
-
Synchronization
+
Synchronisation

  • Synchronize on startup. If selected, dive locations in the Android device and those -on the web service synchronize each time the app is started. +on the web service synchronise each time the app is started.

  • @@ -2082,7 +2091,7 @@ appears in the bottom panel of the Shift times dialog. Now Subsurfa 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, Subsurface knows exactly what the time difference between -camera and dive computer is, and synchronisation is achieved. The image below shows a +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 B above.

    @@ -2152,13 +2161,14 @@ Users should refer to Appendix D for more informa

    4.2. The Stats tab (for groups of dives)

    The Stats tab gives summary statistics for more than one dive, assuming that -more than one dive have been selected in the Dive List using the standard +more than one dive has been selected in the Dive List using the standard Ctrl-click or Shift-click of the mouse. If only one dive has been selected, figures pertaining to only that dive are given. This tab shows the number of dives selected, the total amount of dive time in these dives, -as well as the minimum, maximum and mean for the dive duration, dive depth, -water temperature and surface air consumption (SAC).

    +as well as the minimum, maximum and mean for the dive duration, +water temperature and surface air consumption (SAC). It also shows the depth of the +shallowest and deepest dives of those selected.

4.3. The Dive Profile

@@ -2590,7 +2600,7 @@ now shows only the titles for the trips.

5.3.1. Editing the title and associated information for a particular trip

Normally, in the dive list, minimal information is included in the trip title. More information about a trip can be added by selecting its trip title from -the Dive list. This shows a Trip Notes tab in the Dive Notes panel. Here +the Dive List. This shows a Trip Notes tab in the Dive Notes panel. Here users can add or edit information about the date/time, the trip location and any other general comments about the trip as a whole (e.g. the dive company that was dived with, the general weather and surface conditions during the trip, etc.). @@ -2602,7 +2612,7 @@ edited information.

5.3.2. Viewing the dives during a particular trip

-

Once when the dives have been grouped into trips, users can expand one or more +

Once the dives have been grouped into trips, users can expand one or more trips by clicking the arrow-head on the left of each trip title. This expands the selected trip, revealing the individual dives performed during the trip.

@@ -2626,7 +2636,7 @@ top 3 dives; trip 2: bottom 2 dives) by selecting and right-clicking the top three dives. The resulting context menu allows the user to create a new trip by choosing the option Create new trip above. The top three dives are then grouped -into a separate trip. The figures bellow shows the selection and context menu +into a separate trip. The figures below shows the selection and context menu on the left (A) and the completed action on the right (B):

@@ -2683,7 +2693,7 @@ merge these dives onto a single dive by selecting the appropriate dives, right-clicking them to bring up the context menu and then selecting Merge selected dives. It may be necessary to edit the dive information in the Dive Notes panel to reflect events or conditions that apply to the merged dive. The figure -below shows the depth profile two such dives that were merged:

+below shows the depth profile of two such dives that were merged:

Example: Merged dive @@ -2788,7 +2798,49 @@ instance www.divelogs.de.

-

7. Printing a dive log

+

7. Keeping a Subsurface dive log in the Cloud

+
+

For each diver, dive log information is highly important. Not only is it a record +of diving activities for one’s own pleasure, but it is important information required +for admission to further training courses or (sometimes) even diving sites. The +security of the dive log is therefore critical. In order to have a dive log that is +resistant to failure of a home computer hard drive, loss or theft of equipment, the +Cloud is an obvious solution. This also has the added benefit that one can access one’s dive +log from anywhere in the world without having to carry it with oneself. For this +reason, facilities such as divelogs.de and Diving Log offer facilities to store +dive log information on the Internet. Although Subsurface does not offer integrated +Cloud storage of dive logs, it is simple to achieve this using several of the +existing facilities on the Internet.

+

For instance +Dropbox +offers a free application that allows +files on the Dropbox servers to be seen as a local folder on one’s desktop computer.

+
+
+FIGURE: Dropbox folder +
+
+

Currently there are no costs involved for this service. In this +case, one can store one’s dive log on Dropbox in a totally seamless way: a dive log in +one’s Dropbox folder can be opened and saved directly by Subsurface and it can +be accessed from any place with Internet access. Dropbox (Windows, Mac +and Linux) can be installed by accessing the +Install Page on the Dropbox website +. Alternatively one can use Dropbox as a mechanism to backup one’s dive log. To +Store a dive log in the Cloud, select File→Save as from the Subsurface main menu, +navigate to the Dropbox folder and select the Save button. To access the dive log +in the Cloud, select File→Open Logbook from the Subsurface +main menu and navigate to the dive log file in the Dropbox folder and select the +Open button. +Both options Open and Save are done on the local copy of the dive log saved +on one’s computer’s folder Dropbox, so there’s no need of direct internet +conexion. If the local copy is modified, e.g. adding a dive, the copy in the +Dropbox server in the Cloud will be automatically updated when connecting to +the internet.

+
+
+
+

8. Printing a dive log

Subsurface provides a simple interface to print a whole dive log or only a few selected dives, including dive profiles and other contextual information.

@@ -2879,19 +2931,21 @@ the output for one particular page.

FIGURE: Print preview page
+

Several paid services exist on the Internet (e.g. Google, Amazon) where the same +process could be used for the Cloud-based storage of dive logs.

-

8. Setting user Preferences for Subsurface

+

9. Setting user Preferences for Subsurface

-

There are several settings within Subsurface that the users can specify. These +

There are several settings within Subsurface that the user can specify. These are found when selecting File→Preferences. The settings are performed in -four groups: Defaults, Units, Graph, Language and Network. All five sections -operate on the same principles: the user must specify the settings the are to be changed, then +five groups: Defaults, Units, Graph, Language and Network. 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 Apply button. After applying all the new settings users can then leave the settings panel by selecting OK.

-

8.1. Defaults

+

9.1. Defaults

There are several settings in the Defaults panel:

@@ -2940,7 +2994,7 @@ at all.

  • -Subsurface Webservice: When one subscribes to the Subsurface web service, a very +Subsurface web service: When one subscribes to the Subsurface web service, a very long and hard-to-remember userID is issued. This is the place to save that userID. By checking the option Save User ID locally?, one ensures that a local copy of that userID is saved. @@ -2955,7 +3009,7 @@ cleared and set to default values.

    • -

    8.2. Units

    +

    9.2. Units

    FIGURE: Preferences Units page @@ -2965,10 +3019,10 @@ cleared and set to default values. 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 Personalise radio button, units can be selected -independently, with some units in the metric system and other in the imperial.

    +independently, with some units in the metric system and others in imperial.

    -

    8.3. Graph

    +

    9.3. Graph

    FIGURE: Preferences Graph page @@ -2993,7 +3047,7 @@ highlighted in red, indicating that the threshold has been exceeded.

  • -draw dive computer reported ceiling red: This checkbox allows exactly what it says. +Draw dive computer reported ceiling red: This checkbox allows exactly what it says. Not all dive computers report ceiling values. If the dive computer does report it, it may differ from the ceilings calculated by Subsurface. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a dive computer can calculate ceilings during a dive. @@ -3001,12 +3055,12 @@ dive computer can calculate ceilings during a dive.

  • -Show non-used cylinders in Equipment Tab: This checkbox allows display of information about non-used cylinders when viewing the Equipment Tab. Conversely, if this box is un-checked, and any cylinders entered using the Equipment Tab are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list. +Show unused cylinders in Equipment Tab: This checkbox allows display of information about unused cylinders when viewing the Equipment Tab. Conversely, if this box is not checked, and any cylinders entered using the Equipment Tab are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.

  • -show average depth: Activating this checkbox causes Subsurface to draw a red line across +Show average depth: Activating this checkbox causes Subsurface to draw a red line across the dive profile, indicating the mean depth of the dive.

    • @@ -3014,7 +3068,12 @@ the dive profile, indicating the mean depth of the dive.

  • -Misc: Gradient Factors: Here users can set the gradient factors used while diving. GF_Low is +Misc: +

    +
      +
    • +

      +Gradient Factors:* Here users can set the gradient factors used while diving. GF_Low is the gradient factor at depth and GF_High is used just below the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. Gradient factors add conservatism to the nitrogen exposure during a dive, in a @@ -3026,7 +3085,7 @@ harsh. Checking GFLow at max depth box causes GF_Low to be used 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:

      -
    -

    8.4. Language

    -

    Choose a language that Subsurface mus use.

    +

    9.4. Language

    +

    Choose a language that Subsurface will use.

    FIGURE: Preferences Language page @@ -3055,18 +3114,19 @@ 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 Filter text box allows one to list similar languages. For instance there are several system variants of English -or French.

    +or French. This particular preference requires a restart of Subsurface to take +effect.

    -

    8.5. Network

    +

    9.5. Network

    This panel facilitates communication between Subsurface and data sources on the Internet.

    FIGURE: Preferences Network page
    -

    This important, for instance, when Subsurface needs to communicate with Internet -services such as the _Subsurface Companion app or data export/import +

    This is important, for instance, when Subsurface needs to communicate with Internet +services such as the Subsurface Companion app or data export/import from Divelogs.de. These Internet requirements are determined by one’s type of connection to the Internet and by the Internet Service Provider (ISP) used. One’s ISP should provide the appropriate information. @@ -3080,7 +3140,7 @@ through the proxy server to access the Internet.

    -

    9. The Subsurface dive planner

    +

    10. The Subsurface dive planner

    Dive planning is an advanced feature of Subsurface, accessible by selecting Log → Plan Dive from the main menu. It allows calculation of nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the addition of gradient factors as @@ -3135,7 +3195,7 @@ this feature.

    -

    9.1. The Subsurface dive planner screen

    +

    10.1. The Subsurface dive planner screen

    Like the Subsurface dive log, the planner screen is divided into several sections (see image below). The setup parameters for a dive are entered into the several sections on the left hand side of the screen. The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Dive Notes.

    @@ -3152,7 +3212,7 @@ any warning messages about the dive plan are printed.

    • -

    9.2. Initiating dive planning

    +

    10.2. Initiating dive planning

    The dive planner comprises two parts: constructing a dive plan and evaluating that dive plan. To perform dive planning, perform these steps:

      @@ -3192,7 +3252,7 @@ planning.
    -

    9.3. Managing nitrogen, oxygen and gas consumption

    +

    10.3. Managing nitrogen, oxygen and gas consumption

    The planning is performed in three stages:

    • @@ -3334,7 +3394,7 @@ towards the bottom left of the green design panel. The saved dive plan will appe in the Dive List panel of Subsurface.

    -

    9.4. The dive plan details

    +

    10.4. The dive plan details

    On the bottom right of the dive planner, under Dive Plan Details, the exact details of the dive plan are provided. These details may be modified by checking any of the options under the Dive Notes section of the dive planner, immediately to the left @@ -3348,7 +3408,7 @@ time to get to that level. However, if the Display transition in deco o the transitions are shown separately from the segment durations at a particular level.

    -

    9.5. Printing the dive plan

    +

    10.5. Printing the dive plan

    Selecting the Print button in the planner allows printing of the Dive Plan Details for wet notes. Alternatively one can cut and paste the Dive Plan Details for inclusion in a text file or word processing document.

    @@ -3362,7 +3422,7 @@ accessed in the same way as during the planning process. The only way to print t dive plan is to use the File→Print facility on the main menu in the same way as for dive logs.

    -

    9.6. Planning for repetitive dives

    +

    10.6. Planning for repetitive dives

    Repetitive dives can easily be planned if the dates and start times of the repetitive dive set is specified appropriately in the top left-hand Start Time field. Subsurface @@ -3381,13 +3441,13 @@ planner: the planner takes into account the configuration in the highlighted div

    -

    10. Description of the Subsurface Main Menu items

    +

    11. Description of the Subsurface Main Menu items

    This section describes the functions and operation of the items in the Main Menu of Subsurface. Several of the items below are links to sections of this manual dealing with the appropriate operations.

    -

    10.1. File

    +

    11.1. File

    • @@ -3441,7 +3501,7 @@ the selected dives in the logbook) to one of several formats.

    -

    10.2. Import

    +

    11.2. Import

    • @@ -3470,7 +3530,7 @@ from www.Divelogs.de.

    -

    10.3. Log

    +

    11.3. Log

    • @@ -3496,13 +3556,13 @@ trips.

    • -<<S_DeviceNames_,Edit Device Names - Edit the names of dive computers to facilitate your logs. +Edit Device Names - Edit the names of dive computers to facilitate your logs.

    -

    10.4. View

    +

    11.4. View

    • @@ -3532,8 +3592,8 @@ simmultaneously.

    • -Yearly Statistics - Display summary statistics about dives during the last -year. +Yearly Statistics - Display summary statistics about dives during this and past +years.

    • @@ -3554,7 +3614,7 @@ year.
    -

    10.5. Filter

    +

    11.5. Filter

    • @@ -3564,7 +3624,7 @@ year.

    -

    10.6. Help

    +

    11.6. Help

    -

    11. APPENDIX A: Operating system specific information for importing dive information from a dive computer.

    +

    12. APPENDIX A: Operating system specific information for importing dive information from a dive computer.

    -

    11.1. Make sure that the OS has the required drivers installed

    +

    12.1. Make sure that the OS has the required drivers installed

    @@ -3632,7 +3692,7 @@ On a Mac users sometimes have to manually hunt for the correct
    -

    11.2. How to Find the Device Name for USB devices and set its write permission

    +

    12.2. How to Find the Device Name for USB devices and set its write permission

    +suggestions of ways to find out what the device name is:
    @@ -3643,7 +3703,7 @@ On a Mac users sometimes have to manually hunt for the correct correct device name (or mount point for the Uemis Zurich), or it will disable the device select drop down if no device name is needed at all. In the rare cases where this doesn’t work, here are some -instructions on ways to find out what the device name is:
    On Windows:

    Simply try COM1, COM2, etc. The drop down list should contain all connected COM @@ -3730,7 +3790,7 @@ port, the dive computer interface can connect and one should be able to import dives.

    -

    11.3. Setting up bluetooth enabled devices

    +

    12.3. Setting up bluetooth enabled devices

    @@ -3767,7 +3827,7 @@ Ports to identify the port used for your dive computer. If there are severa ports listed, use the one saying "Outgoing" instead of "Incoming".

    For downloading to Subsurface, the Subsurface drop-down list should contain this COM port already. If not, enter it manually.

    -

    Note: If there are issues afterwards downloading from the dive computer using +

    Note: If there are issues afterwards when downloading from the dive computer using other software, remove the existing pairing with the dive computer.

    On MacOS:

    Click on the Bluetooth symbol in the menu bar and select Set up Bluetooth Device…. The dive computer should then show up in the list of devices. Select it and go @@ -3832,10 +3892,10 @@ address in the last step above, e.g. /dev/rfcomm0.

    -

    12. APPENDIX B: Dive Computer specific information for importing dive information.

    +

    13. APPENDIX B: Dive Computer specific information for importing dive information.

    -

    12.1. Import from a Uemis Zurich

    +

    13.1. Import from a Uemis Zurich

    @@ -3873,7 +3933,7 @@ may have to do this more than once, depending on how many dives are stored on the dive computer.

    -

    12.2. Importing dives from the Uwatec Galileo

    +

    13.2. Importing dives from the Uwatec Galileo

    @@ -3903,7 +3963,7 @@ available from some Internet web sites e.g. available for OSX 10.6 or higher.

    -

    12.3. Importing dives from Heinrichs Weikamp DR5

    +

    13.3. Importing dives from Heinrichs Weikamp DR5

    @@ -3921,7 +3981,7 @@ factors in the Tec Settings in Subsurface to generate a deco o
    -

    12.4. Import from Shearwater Predator using Bluetooth

    +

    13.4. Import from Shearwater Predator using Bluetooth

    @@ -3957,7 +4017,7 @@ switch off WiFi while using Bluetooth
    -

    13. APPENDIX C: Exporting Dive log information from external dive log software.

    +

    14. APPENDIX C: Exporting Dive log information from external dive log software.

    The import of dive log data from external dive log software is mostly performed using @@ -3983,7 +4043,7 @@ Import the accessible dive log data into Subsurface. data from foreign dive log software. The procedures below mostly apply to Linux and/or Windows.

    -

    13.1. Exporting dives from Suunto Divemanager (DM3 and DM4)

    +

    14.1. Exporting dives from Suunto Divemanager (DM3 and DM4)

    @@ -4151,13 +4211,13 @@ The dives are now exported to the file DM4.bak
    -

    13.2. Exporting from Mares Dive Organiser V2.1

    +

    14.2. Exporting from Mares Dive Organiser V2.1

    -
    Note Mares Dive Organiser is a Microsoft application. The dive log is kept as a +Mares Dive Organiser is a Windows application. The dive log is kept as a Microsoft SQL Compact Edition data base with a .sdf filename extension. The data base includes all Dive Organiser-registered divers on the particular computer and all Mares dive computers used. The safest way to obtain a copy @@ -4186,10 +4246,15 @@ DiveOrganiserxxxxx.zip. Inside the zipped directory is a file Extract the .sdf file from the zipped folder to your Desktop.

    +
  • +

    +The password for accessing the .zip file is mares. +

    +
    • -

    13.3. Exporting dives from DivingLog 5.0

    +

    14.3. Exporting dives from DivingLog 5.0

    @@ -4225,10 +4290,10 @@ Click on the export button and select the filename
    -

    14. APPENDIX D: FAQs.

    +

    15. APPENDIX D: FAQs.

    -

    14.1. Subsurface appears to miscalculate gas consumption and SAC

    +

    15.1. Subsurface appears to miscalculate gas consumption and SAC

    Question: I dived with a 12.2 l tank, starting with 220 bar and ending with 100 bar, and I calculate a different SAC compared what Subsurface calculates. Is Subsurface miscalculating?

    Answer: Not really. What happens is that Subsurface actually calculates gas @@ -4259,7 +4324,7 @@ starts becoming much more noticeable at high pressure. A 400 bar really does not contain twice as much air as a 200 bar one. At lower pressures, air acts pretty much like an ideal gas.

    -

    14.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…

    +

    15.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…

    Subsurface ends up ignoring surface time for many things (average depth, divetime, SAC, etc). Question: Why do dive durations in my dive computer differ from that given by Subsurface?

    Answer: For example, if you end up doing a weight check (deep enough to trigger the "dive started") @@ -4276,7 +4341,7 @@ you may stay in the water for a long time, but spend most of it at the surface.

    diff --git a/Documentation/user-manual_es.html.git b/Documentation/user-manual_es.html.git index da90e990b..46a672b65 100644 --- a/Documentation/user-manual_es.html.git +++ b/Documentation/user-manual_es.html.git @@ -429,14 +429,14 @@ unificado.

  • ¿Usas más de un sistema operativo? Subsurface es totalmente compatible con -Mac, Linux y Microsoft permitiéndote acceder a tu registro de buceo de de la +Mac, Linux y Windows permitiéndote acceder a tu registro de buceo de de la misma forma desde cualquiera de estos sistemas operativos.

  • ¿Utilizas Linux o Mac pero tu ordenador de buceo solo tiene software basado en -Microsoft para descargar la información de buceo (p.e. Mares)? Subsurface te +Windows para descargar la información de buceo (p.e. Mares)? Subsurface te proporciona una manera de almacenar y analizar las inmersiones en otro sistema operativo.

    @@ -665,7 +665,9 @@ divemasters del diario actual.

    • separados por comas, que acompañaron al usuario en la inmersión. También se ofrece autocompletado basado en la lista de compañeros del diario.

    Traje: Aquí puede introducirse el tipo de traje de buceo que se utilizó para -la inmersión. Como en los casos anteriores está disponible el autocompletado.

    +la inmersión. Como en los casos anteriores está disponible el autocompletado. +Los usuarios de traje seco pueden, por ejemplo, guardar cualquier combinación +de traje y protección térmica que hayan utilizado.

    Valoración: En este campo se puede proporcionar una calificación subjetiva de la inmersión en una escala de 5 puntos, clicando en la estrella correspondiente.

    Visibilidad: Como en el caso anterior, se puede proporcionar una calificación @@ -2736,7 +2738,50 @@ en el navegador, como el tamaño de la letra o el tema aplicado.

    -

    8. Imprimir un diario

    +

    8. Subsurface en la Nube

    +
    +

    Para cualquier buceador, la información contenida en su diario es muy importante. +No es únicamente un registro de actividades de buceo para su propio placer +personal, sino que es información importante requerida para su admisión en +futuros cursos de entrenamiento o (en ocasiones) incluso en puntos de buceo. La +seguridad del diario es, así pues, crítica. De cara a poseer un diario que pueda +soportar el fallo del disco duro del ordenador de casa, el robo o la perdida del +equipo, etc, la nube es una solución obvia. Esto, además, añade el beneficio +de que se puede acceder al diario, casi, desde cualquier parte del mundo sin +tener que llevarlo encima. Por este motivo, facilidades como divelogs.de y +Diving Log ofrecen la posibilidad de guardar dicha información en internet.

    +

    Aunque Subsurface no ofrece almacenamiento integrado de diarios en la nube, es +facil de conseguir utilizando alguno de los varios servicios existentes en +internet.

    +

    Por ejemplo Dropbox ofrece una aplicación gratuita +que permite que se vean como locales en nuestro ordenador los archivos guardados +en sus servidores.

    +
    +
    +FIGURE: Carpeta de Dropbox +
    +
    +

    Actualmente el servicio no tiene ningún coste. Se puede guardar el diario de +buceo en Dropbox de forma muy sencilla: el diario en nuestra carpeta de +Dropbox puede ser abierto y guardado directamente por Subsurface y se +puede utilizar desde cualquier sitio con acceso a internet. Dropbox se puede +instalar accediendo a la página de instalación +de Dropbox. Como alternativa, se puede utilizar Dropbox como mecanismo para +mantener una copia de seguridad del diario. +Para guardar un diario en la nube, selecciona Archivo→ Guardar como desde +menú principal de Subsurface, navega a la carpeta Dropbox y selecciona el +botón Guardar. Para usar el diario en la nube, selecciona Archivo→Abrir +registro desde el menú principal de Subsurface, navega al archivo en la +carpeta Dropbox y selecciona el botón Abrir. +Tanto las funciones Abrir como Guardar se efectuan sobre la copia guardada +en la carpeta de nuestro ordenador, por lo que no es necesaria conexión directa +a internet. Si se modifica la copia local, p.e. al añadir una inmersión, la +copia en el servidor Dropbox en la nube se actualizará automáticamente al +volvernos a conectar a internet.

    +
    +
    +
    +

    9. Imprimir un diario

    Subsurface proporciona un interfaz simple para imprimir el diario completo o solo unas pocas inmersiones seleccionadas, incluyendo los perfiles de buceo y @@ -2761,7 +2806,12 @@ perfil ? El usuario selecciona la información correcta desde el menú principal

    Ahora habra que seleccionar las opciones de impresión. Para ello se selecciona Archivo → Imprimir desde el menú principal. Aparecerá el siguiente diálogo (ver la imagen [A] abajo):

    -

    En Tipo de impresión habrá que seleccionar una de las tres opciones

    +
    +
    +FIGURA: Dialogo de impresión +
    +
    +

    En Tipo de impresión habrá que seleccionar una de las cuatro opciones

    • @@ -2771,13 +2821,19 @@ Imprimir la lista de inmersiones. Para ello se selecciona Impresión de tabla.

    • Imprimir los registros de buceo completos (perfiles y resto de información) a -6 inmersiones por página. Para ello se selecciona 6 inmersiones por página. +6 inmersiones por página. Para ello se selecciona 6 inmersiones por página.

    • Imprimir los registros de buceo completos (perfiles y resto de información) a -2 inmersiones por página. Para ello se selecciona 2 inmersiones por página. +2 inmersiones por página. Para ello se selecciona 2 inmersiones por página. +

      +
      • +
    • +

      +Imprimir los registros de buceo completos (perfiles y resto de información) a +1 inmersión por página. Para ello se selecciona 1 inmersión por página.

    @@ -2800,17 +2856,12 @@ Imprimir en color. Para ello se selecciona la opción Impresión en colorB) arriba a la derecha, la cual presenta el texto -sobre el perfil.

    +impresión. Ver la imagen a continuación la cual presenta el texto sobre el +perfil.

    El usuario puede Previsualizar la página impresa seleccionando el botón Previsualizar del diálogo. Después de previsualizar, se pueden hacer cambios en las opciones del diálogo de impresión para ajustarlas a los gustos personales.

    -
    -
    -FIGURA: Diálogo de impresión -
    -

    Ahora se selecciona el botón Imprimir del diálogo. Esto lanzará el diálogo de impresión habitual usado por el sistema operativo del usuario (imagen [B] en el centro, arriba), que le permitirá elegir una impresora y ajustar sus @@ -2826,7 +2877,7 @@ continuación hay un ejemplo (bastante pequeño) de la salida de una impresión.

    -

    9. Ajustar las Preferencias del usuario para Subsurface

    +

    10. Ajustar las Preferencias del usuario para Subsurface

    Hay varios ajustes en Subsurface que el usuario puede especificar. Se encuentran a través de Archivo → Preferencias. Los ajustes se efectúan en @@ -2837,7 +2888,7 @@ Tras aplicarlos todos se puede salir seleccionando Aceptar o si finalmente decide no hacer los cambios.

    -

    9.1. Predeterminados

    +

    10.1. Predeterminados

    Hay varios ajustes en el panel Predeterminados:

    @@ -2904,7 +2955,7 @@ se borran todos los ajustes y se reinician con los valores por defecto.
    -

    9.2. Unidades

    +

    10.2. Unidades

    FIGURA: Página de preferencias de unidades @@ -2921,7 +2972,7 @@ botella, habitualmente, manejan velocidades en m/min, sin embargo, los apneísta ascienden mucho más deprisa por lo que suelen utilizar velocidades en m/s.

    -

    9.3. Gráfico

    +

    10.3. Gráfico

    FIGURA: Página de Preferencias del gráfico @@ -3008,7 +3059,7 @@ información, ver:
    -

    9.4. Lenguaje

    +

    10.4. Lenguaje

    Se elige el lenguaje que debe utilizar Subsurface.

    @@ -3024,7 +3075,7 @@ lista de traducciones. La casilla de texto Filtro permite listar lengua similares. Por ejemplo hay diversas variantes de inglés o francés.

    -

    9.5. Red

    +

    10.5. Red

    Este panel facilita la comunicación entre Subsurface y las fuentes de datos en internet.

    @@ -3047,7 +3098,7 @@ para acceder a internet.

    -

    10. El Planificador de Subsurface

    +

    11. El Planificador de Subsurface

    La planificación de inmersiones es una característica avanzada de Subsurface accesible desde Registro → Planificar Inmersión en el menú principal. Permite @@ -3105,7 +3156,7 @@ anteriores, no debería utilizar esta capacidad de Subsurface.

    -

    10.1. La pantalla del planificador de Subsurface

    +

    11.1. La pantalla del planificador de Subsurface

    Al igual que el diario de Subsurface, la pantalla del planificador se divide en varias secciones (ver imagen a continuación). Los parámetros de ajuste de una inmersión se introducen en las diversas secciones a la izquierda de la pantalla. @@ -3126,7 +3177,7 @@ cualquier mensaje de aviso sobre el plan de buceo.

    -

    10.2. Iniciar la planificación de la inmersión

    +

    11.2. Iniciar la planificación de la inmersión

    El Planificador comprende dos partes: construir un plan de buceo y evaluar dicho plan. Para llevar a cabo planificación de inmersiones, sigue estos pasos:

      @@ -3168,7 +3219,7 @@ esta etapa de la planificación.
    -

    10.3. Controlar los gases inertes, el oxígeno y el consumo de gas

    +

    11.3. Controlar los gases inertes, el oxígeno y el consumo de gas

    La planificación se efectúa en tres pasos:

    • @@ -3297,7 +3348,7 @@ seguido de un ascenso usando EAN50:

    aparecerá en el panel Lista de Inmersiones.

    -

    10.4. Los detalles del plan de buceo

    +

    11.4. Los detalles del plan de buceo

    En la parte inferior derecha del planificador, bajo el encabezamiento Detalles del plan de buceo, se proporcionan los detalles exactos del plan de inmersión. Estos detalles pueden modificarse seleccionando cualquiera de las opciones bajo @@ -3312,14 +3363,25 @@ embargo, si se selecciona Mostrar transiciones en deco, las transicione muestran separadamente de las duraciones de las paradas en cada nivel.

    -

    10.5. Imprimir el plan de inmersión

    +

    11.5. Imprimir el plan de inmersión

    Seleccionar el botón Imprimir permite imprimir los Detalles del plan de buceo para unas "wet notes". También se pueden copiar y pegar los Detalles del plan de buceo para incluirlos en un archivo de texto o un procesador de textos.

    +

    Los planes de inmersión tienen muchas características en común con los registros +de buceo (perfil, notas, etc). Despues de haber guardado un plan, los detalles y +los calculos de gas quedan almacenados en la pestaña Notas de la inmersión. +Mientras se está diseñando un plan, se puede imprimir utilizando el botón +Imprimir del planificador. Esto imprimirá los detalles y cálculos de gases del +panel Detalles del plan de inmersión del planificador. Sin embargo, tras haber +sido guardado, aparece de una forma muy similar a una anotación en el diario y +no se puede acceder a los cáculos de gas de la misma forma que durante el proceso +de planificación. En esta situación, la única manera de imprimir el plan es usar +Archivo → Imprimir en el menú principal, igual que haríamos para imprimir un +registro de inmersión.

    -

    10.6. Planificar inmersiones sucesivas

    +

    11.6. Planificar inmersiones sucesivas

    Se pueden planear fácilmente inmersiones sucesivas si la fecha y hora de las mismas se especifican correctamente en el campo arriba a la izquierda Hora de inicio. SUbsurface calcula las cargas de gases inertes de la primera @@ -3338,13 +3400,13 @@ en cuenta la configuración de la plantilla seleccionada.

    -

    11. Descripción de las opciones del menú principal de Subsurface

    +

    12. Descripción de las opciones del menú principal de Subsurface

    Esta sección describe las funciones y manejo de las opciones del menú principal de Subsurface. Varias de las opciones que veremos luego son links a secciones de este manual que describen las operaciones con más detalle.

    -

    11.1. Archivo

    +

    12.1. Archivo

    • @@ -3399,7 +3461,7 @@ inmersiones seleccionadas en el diario) a algún otro formato.

    -

    11.2. Importar

    +

    12.2. Importar

    • @@ -3428,7 +3490,7 @@ de buceo desde www.divelogs.de.

    -

    11.3. Registro

    +

    12.3. Registro

    • @@ -3463,7 +3525,7 @@ asignados a los ordenadores de buceo.

    -

    11.4. Vista

    +

    12.4. Vista

    • @@ -3512,7 +3574,7 @@ inmersiones efectuadas.

    -

    11.5. Filtrar

    +

    12.5. Filtrar

    • @@ -3522,7 +3584,7 @@ inmersiones efectuadas.

    -

    11.6. Ayuda

    +

    12.6. Ayuda

    • @@ -3546,10 +3608,10 @@ versión de Subsurface en la página_web_de__Subsurface_.

    -

    12. APÉNDICE A: Información específica del sistema operativo para importar inmersiones desde un ordenador de buceo.

    +

    13. APÉNDICE A: Información específica del sistema operativo para importar inmersiones desde un ordenador de buceo.

    -

    12.1. Asegúrate de que el SO tiene instalados los drivers necesarios

    +

    13.1. Asegúrate de que el SO tiene instalados los drivers necesarios

    @@ -3588,7 +3650,7 @@ de documentos y software de Silicon Labs.
    -

    12.2. Como encontrar el nombre de dispositivo para conexiones USB y ajustar sus permisos de escritura

    +

    13.2. Como encontrar el nombre de dispositivo para conexiones USB y ajustar sus permisos de escritura

    @@ -3681,7 +3743,7 @@ escritura para el puerto USB, el interface del ordenador de buceo puede conectarse y se debería poder importar las inmersiones.

    -

    12.3. Ajustar dispositivos con bluetooth

    +

    13.3. Ajustar dispositivos con bluetooth

    @@ -3787,10 +3849,10 @@ como nombre de dispositivo a utilizar.

    -

    13. APÉNDICE B: Información específica por ordenadores de buceo.

    +

    14. APÉNDICE B: Información específica por ordenadores de buceo.

    -

    13.1. Importar desde un Uemis Zurich

    +

    14.1. Importar desde un Uemis Zurich

    @@ -3825,7 +3887,7 @@ tenga que repetir esta operación más de una vez dependiendo de cuantos buceos haya guardados en el ordenador.

    -

    13.2. Importar buceos desde el Galileo de Uwatec

    +

    14.2. Importar buceos desde el Galileo de Uwatec

    @@ -3853,7 +3915,7 @@ en algunos sitios de internet p.e. OSX 10.6 o superior.

    -

    13.3. Importar buceos desde Heinrichs Weikamp DR5

    +

    14.3. Importar buceos desde Heinrichs Weikamp DR5

    -

    13.4. Importar del Shearwater Predator usando Bluetooth

    +

    14.4. Importar del Shearwater Predator usando Bluetooth

    @@ -3870,7 +3932,7 @@ seguridad, de la calculada por el DR5.
    @@ -3906,7 +3968,7 @@ Apagar Wi-Fi mientras se utiliza bluetooth
    -

    14. APÉNDICE C: Exportar información de diarios desde otros softwares externos.

    +

    15. APÉNDICE C: Exportar información de diarios desde otros softwares externos.

    La importación de datos de diarios de buceos desde softwares externos se efectúa, habitualmente, utilizando el dialogo que resulta de seleccionar @@ -3931,7 +3993,7 @@ Importar el diario accesible a Subsurface. diarios desde softwares externos. Los procedimientos a continuación se aplican mayormente en Linux y/o Windows.

    -

    14.1. Exportar inmersiones desde Suunto Divemanager (DM3 y DM4)

    +

    15.1. Exportar inmersiones desde Suunto Divemanager (DM3 y DM4)

    @@ -4103,13 +4165,13 @@ Los buceos se han exportado al archivo DM4.bak
    -

    14.2. Exportar desde Mares Dive Organiser V2.1

    +

    15.2. Exportar desde Mares Dive Organiser V2.1

    -
    Note Mares Dive Organiser es una aplicación de Microsoft. El diario de inmersiones se +Mares Dive Organiser es una aplicación de Windows. El diario de inmersiones se guarda en una base de datos Microsoft SQL Compact Edition con una extensión de nombre de archivo .sdf. La base de datos incluye a todos los buceadores registrados en el Dive Organiser del PC y a todos los ordenadores Mares usados. @@ -4140,7 +4202,7 @@ Extrae a tu escritorio el archivo .sdf desde la carpeta comprimida.
    -

    14.3. Exportar inmersiones desde DivingLog 5.0

    +

    15.3. Exportar inmersiones desde DivingLog 5.0

    @@ -4176,10 +4238,10 @@ Hacer clic en el botón de exportar y seleccionar un nombre de archivo.
    -

    15. APENDICE D: Preguntas Frecuentes.

    +

    16. APENDICE D: Preguntas Frecuentes.

    -

    15.1. Subsurface parece calcular mal el consumo de gas y el CAS

    +

    16.1. Subsurface parece calcular mal el consumo de gas y el CAS

    Pregunta: Buceé con una botella de 12,2 l empezando con 220 bar y terminando con 100 bar y yo calculo un CAS distinto al que calcula Subsurface ¿Está calculándolo mal Subsurface?

    @@ -4211,7 +4273,7 @@ altas presiones. A 400 bar realmente no contiene el doble de aire que a 200 bar. A presiones más bajas, el aire se comporta bastante como un gas ideal.

    -

    15.2. Algunos perfiles de inmersión tienen discrepancias de tiempos con las muestras que toma mi ordenador de buceo …

    +

    16.2. Algunos perfiles de inmersión tienen discrepancias de tiempos con las muestras que toma mi ordenador de buceo …

    Subsurface termina por ignorar el tiempo en superficie por varios motivos (profundidad media, tiempo de inmersión, CAS, etc).

    Pregunta: ¿Por qué las duraciones de los buceos en mi ordenador difieren de @@ -4231,7 +4293,7 @@ querrás que te cuente como algún tipo de inmersión larga.