Small changes ensuring the manual description reflects the current main
menu structure.
Section on data export from external dive log software has been
rationalised and made more user friendly.
Kind regards,
willemf
>From ec107bcfe508f806b618397caf45b3d07b0e4a14 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willem@willem-Precision-M4700.(none)>
Date: Tue, 11 Feb 2014 20:46:25 +0200
Subject: [PATCH] The section on the main menu descriptions has been changed a
little bit to reflect the current menu structure. The
section dealing with exprt from other dive software has
been changed to appear more user friendly, with three new
icons.
Signed-off-by: Willem Ferguson <willem@willem-Precision-M4700.(none)>
---
Documentation/images/icons/divingloglogo.jpg | Bin 0 -> 4111 bytes
Documentation/images/icons/mareslogo.jpg | Bin 0 -> 2586 bytes
Documentation/images/icons/suuntologo.jpg | Bin 0 -> 2194 bytes
Documentation/user-manual.txt | 86 +++++++++++++++-----------
4 files changed, 49 insertions(+), 37 deletions(-)
create mode 100644 Documentation/images/icons/divingloglogo.jpg
create mode 100644 Documentation/images/icons/mareslogo.jpg
create mode 100644 Documentation/images/icons/suuntologo.jpg
diff --git a/Documentation/images/icons/divingloglogo.jpg b/Documentation/images/icons/divingloglogo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3864d736429d93f50f8f934e53417dfdc7d758d4
GIT binary patch
literal 4111
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
YlGA490e<yg;euD|PG?&3WX?YP7b1lk?*IS*
literal 0
HcmV?d00001
diff --git a/Documentation/images/icons/mareslogo.jpg b/Documentation/images/icons/mareslogo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..349ba78797422f858ad0b8b7356dd7aacd3b1c61
GIT binary patch
literal 2586
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
Gb>JUO1`SgH
literal 0
HcmV?d00001
diff --git a/Documentation/images/icons/suuntologo.jpg b/Documentation/images/icons/suuntologo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..16fe7b0fa25ec370a0dde532c30b4c694f8b0abf
GIT binary patch
literal 2194
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
aez4FFm)AboJSKfqd8Iz%j~PIidHgrjpD^wK
literal 0
HcmV?d00001
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5d2508a..eb7ed5c 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -707,32 +707,34 @@ available, as in dialogue *B*, above. Currently these are:
- XML-formatted dive logs
- UDDF-formatted dive logs
- UDCF-formatted dive logs
- - JDiveLog
- - Suunto Dive Manager (DM3 and DM4)
- - MacDive (XML)
+ - JDiveLog
+ - Suunto Dive Manager (DM3 and DM4)
+ - MacDive (XML)
- DivingLog 5.0 (XML)
- Kenozooid (UDDF)
- - CSV (text-based and spreadsheet-based) dive logs.
+ - 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
+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
accessible through the Import dialogue are also supported, as explained below.
==== Importing from Mares Dive Organiser V2.1
-Mares dive logs need to be imported using a three-step process,
+Since Mares utilise proprietory Microsoft software not compatible with multi-platform
+software, these dive logs cannot be directly imported into _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.
+the file.
- - Export dive log data from Mares Dive Organiser to your desktop. See
-xref:Mares_Export[Appendix C] for more information.
- - Import the data into _www.divelogs.de_. Create a user account in
+ - Export dive log data from Mares Dive Organiser to your desktop, using
+ a _.sdf_ file name extension. See xref:Mares_Export[Appendix C] for more information.
+ - Import the data into _www.divelogs.de_. Create a user account in
_www.divelogs.de_, log into that web site, then
select _Import Logbook -> Dive Organiser_ from the menu on the left hand side.
-Follow the instructions carefully to transfer the dive information from the
+Follow the instructions carefully to transfer the dive information (in _.sdf_ format) from the
Dive Organiser data base to _www.divelogs.de_.
- Then follow the instructions below to import dives from _divelogs.de_ to
-_Subsurface_.
+_Subsurface_.
[[S_ImportingDivelogsDe]]
@@ -745,7 +747,7 @@ user-ID and password for _divelogs.de_ into the appropriate fields. Then select
the _Download_ button. Download from _divelogs.de_ starts immediately, evident
on a progress bar in the dialogue box. At the and of the download, the
successful status is indicated (see figure on the right [*B*], below). Select the
-_Apply_ button. The imported dives appear in the *Dive List* panel.
+_Apply_ button. The imported dives appear in the _Subsurface_ *Dive List* panel.
image::images/Divelogs1.jpg["FIGURE:Download from Divelogs.de",align="center"]
@@ -1220,8 +1222,8 @@ If you dive regularly, the dive list can rapidly become very long. _Subsurface_
can group dives into _trips_. It performs this by grouping dives that have
date/times that are not separated in time by more than two days, thus creating
a single heading for each diving trip represented in the dive log. Below is an
-ungrouped dive list (A, on the left) as well as a grouped dive list with
-several trips (B, on the right):
+ungrouped dive list (*A*, on the left) as well as the corresponding grouped dive
+list comprising five dive trips (*B*, on the right):
image::images/Group2.jpg["Figure: Grouping dives",align="center"]
@@ -1531,9 +1533,8 @@ the selected dives in the logbook) in UDDF format.
=== Import
- <<S_ImportDiveComputer,_Import from dive computer_>> - Import dive information
from a dive computer.
-- <<S_ImportingUDDF,_Import Files_>> - Import dive information from a file in
-UDDF or in another _Subsurface_-compatible format.
-- _Import CSV_ - Import dive information from a data file in CSV format.
+- <<Unified_import,_Import Files_>> - Import dive information from a file in
+in a _Subsurface_-compatible format.
- <<S_Companion,_Import GPS data from Subsurface Service_>> - Load GPS
coordinates from the _Subsurface_ mobile phone app.
- <<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive information
@@ -1822,20 +1823,28 @@ this, but it is reported to be solved sometimes by one of these steps:
The import of dive log data from external dive log software is mostly performed using
the dialogue found by selecting _Import_ from the Main Menu, then clicking on
-_Import Log Files_. This is a single-step process, more information about which can be found
+_Import Log Files_. This is a single-step process, more information about which can be found
xref:Unified_import[here.]
However, in some cases, a two-step process may be required:
- Export the forieign dive log data to format that is accessible from _Subsurface_.
- Import the accessible dive log data into _Subsurface_.
-This appendix provides some information about approaches to export dive log data from foreign
+This appendix provides some information about approaches to export dive log data from foreign
dive log software. The procedures below mostly apply to Linux and/or Windows.
[[S_ImportingDivesSuunto]]
-=== Exporting dives from *Suunto Divemanager 3 (DM3)*
+=== Exporting dives from *Suunto Divemanager (DM3 and DM4)*
+[icon="images/icons/suuntologo.jpg"]
+[NOTE]
+Divemanager 3 (DM3) is an older version of the Suunto software. More recent
+Suunto dive computers use Divemanager 4 (DM4). The
+two versions of Divemanager use different methods and different file naming
+conventions to export dive log data.
+
+*Divemanager 3 (DM3):*
- - Start 'Suunto Divemanager' and log in with the name containing the logs
+ - Start 'Suunto Divemanager 3' and log in with the name containing the logs
- Do not start the import wizard to import dives from your computer.
- In the navigation tree on the left side of the program-window, select your
dives.
@@ -1854,9 +1863,7 @@ last dive
* You are back in the Export pop-up. Press the button 'Export'
- Your dives are now exported to the file Divelogs.SDE.
-
-[[S_ImportingDivesSuuntoDM4]]
-=== Exporting dives from *Suunto Divemanager 4 (DM4)*
+*Divemanager 4 (DM4):*
To import divelog from 'Suunto DM4', you need to locate the DM4 database
where the dives are stored. You can either look for the original
@@ -1884,25 +1891,27 @@ Backing up Suunto DM4:
=== Exporting from Mares Dive Organiser V2.1
[[Mares_Export]]
-Mares Dive Organiser is a Windows application. The dive log is kept as a
+[icon="images/icons/mareslogo.jpg"]
+[NOTE]
+Mares Dive Organiser is a Microsoft 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. Since
-Mares utilise proprietory Windows software not compatible with multi-platform software,
-these dive logs cannot be directly imported into _Subsurface_. The safest way to obtain a copy
-these dive data base is to export the information to another compatibale format
-which can be imported into _Subsurface_.
-
- - Within Dive Organiser, select
-_Database -> Backup_ from the main menu and back up the data base to the desk top.
-This creates a zipped file DiveOrganiserxxxxx.dbf.
+computer and all Mares dive computers used. The safest way to obtain a copy
+of the dive data base is to export the information to another compatibale format
+which can be imported into _Subsurface_.
+
+ - Within Dive Organiser, select
+_Database -> Backup_ from the main menu and back up the data base to the desk top.
+This creates a zipped file DiveOrganiserxxxxx.dbf.
- Rename the file to
DiveOrganiserxxxxx.zip. Inside the zipped directory is a file _DiveOrganiser.sdf_.
- - Extract it from the zipped folder to your Desktop.
+ - Extract the _.sdf_ file from the zipped folder to your Desktop.
[[S_ImportingDivinglog]]
=== Exporting dives from *DivingLog 5.0*
+[icon="images/icons/divingloglogo.jpg"]
+[NOTE]
Unfortunately DivingLog XML files give us no
indication on the preferences set on your system. So in order for
_Subsurface_ to be able to successfully import XML files from DivingLog
@@ -1914,3 +1923,6 @@ button). Then do the following:
- In Divinglog open the 'File -> Export -> XML' menu
- Select the dives that you want to export
- Click on the export button and select the filename
+
+
+
--
1.7.10.4
_______________________________________________
subsurface mailing list
[email protected]
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
