User manual update [part 3 of 3]
Update:
1) Text dealing with SmartTrak import. Move text, some corrections,
add image.
2) Text dealing with command-line arguments.
A few other small changes.
Signed-off-by: Willem Ferguson <[email protected]>
*IMPORTANT:*
*A)**SmartTrak:*
The SmartTrak text is moved a little bit higher up in the document, just
after the section on Mares Dive Organiser import.
The command-line example as originally pulled read "smtk2ssrfc" and I
believe the "c" is erroneous. The original text also did not include the
figure, which I do include here in .jpg format. I did a few stylistic
changes.
*B) **Command-line parameters:*
Miika, I used your patch submission to add this text.
*C)**NB:* If anything else could be done with the user manual for
release 4.6, please let me know.
Kind regards,
willem
>From 2c19d7ada4ed74dd576c55f807e5d28d443d4830 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <[email protected]>
Date: Sat, 7 Jan 2017 13:02:23 +0200
Subject: [PATCH] [PATCH] User manual update [part 3 of 3]
Update:
1) Text dealing with SmartTrak import. Move text, some corrections,
add image.
2) Text dealing with command-line arguments.
A few other small changes.
Signed-off-by: Willem Ferguson <[email protected]>
---
Documentation/images/smtk2ssrf.jpg | Bin 0 -> 17696 bytes
Documentation/user-manual.txt | 162 ++++++++++++++++++++++---------------
2 files changed, 96 insertions(+), 66 deletions(-)
create mode 100644 Documentation/images/smtk2ssrf.jpg
diff --git a/Documentation/images/smtk2ssrf.jpg b/Documentation/images/smtk2ssrf.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d77a3f5a3cf8bb3ee5dc0dad917e7be8a5fefca7
GIT binary patch
literal 17696
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
N!0q#aZ^+f${{atK!L$GX
literal 0
HcmV?d00001
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e5fc49f..6ded45b 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1054,6 +1054,76 @@ using _www.divelogs.de_ as a gateway to extract the dive log information.
from _divelogs.de_ to _Subsurface_, using the instructions below.
+[[S_SmartTrakImport]]
+==== Importing Scubapro _SmartTrak_ divelogs
+
+_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along with a plethora
+of other data manually added by the user, ranging from dive points to buddies data or DAN survey
+info. However, this is Microsoft Windows-based propietary software by Uwatec (today Scubapro)
+using Microsoft Access databases, preventing the integration the importer into the _Subsurface_
+core application.
+
+A stand alone tool for Linux has been developed to import the _.slg_ files
+generated by SmartTrak to Subsurface's _.xml_ format. It can be built together
+with _Subsurface_ for Linux systems. Two dependencies need to be installed in
+your system before building: _libglib2.0_ and _libmdb2_.
+
+Feel free to contact the _Subsurface_ development team on mailto:[email protected][our mailing list]
+for assistance in importing _SmartTrak_ dive logs.
+
+Assuming the above dependencies
+have been installed and the _Subsurface_ source tree is in the directory _~/src/subsurface_, then:
+
+===== Building _smtk2ssrf_
+
+- Move to the source tree directory.
+- Run " $ ccmake build " and set SMARTTRAK_IMPORT option to *on* (off by
+ default).
+- Generate with [c] and save and exit with [g].
+- Build as you prefer, using the _build.sh_ script (recomended) or moving to build
+ directory and running _make_.
+- After a successful build, there will be an executable named _smtk2ssrf_ in the
+ _subsurface/build_ directory.
+ Copy or move it to a directory in your $PATH, e.g. _~/bin_.
+
+===== Running
+
+_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without
+parameters in a graphical user interface, a simple window
+opens for choosing the _.slg_ file(s) to import and a destination file to store the
+_Subsurface_-formatted data into (see image below).
+
+image::images/smtk2ssrf.jpg["FIGURE:Download from SmartTrak",align="center"]
+
+[icon="images/icons/warning2.png"]
+[WARNING]
+Existing data in the destination file will be
+erased, so *DO NOT* use a regular subsurface divelog file as a destination:
+rather, specify a *new* filename as a destination.
+
+If launched from a command line with two or more parameters, the format is as follows:
+
+ $ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml
+
+where _input_ is the directory containing the .slg file(s) and _output_ is the
+directory where the _Subsurface_-formatted output is written to.
+Files _file_1.slg_ and _file_2.slg_ in the _input_ directory are imported and stored
+in _file3.xml_ in the _output_ directory. Check any warning and error messages
+in the console or in the graphical window: some may be
+relevant as support for Galileo family of dive computers is still a work in
+progress.
+
+===== Merging the imported dives with the existing divelog
+
+Open the new file (generated in the previous steps) using _Subsurface_ and check the dives and data.
+If everything is fine, close the _.xml_ file and open your regular divelog.
+Then from the *Main Menu* select _Import -> Import log file_ and choose the
+_.xml_ file containing the imported dives: these will show in the *Dive List*, time
+ordered, along with the existing dives.
+The new dives, although time ordered, will keep the numbering system from
+_SmartTrak_, so a renumbering action is needed. See the section on xref:S_Renumber[Renumbering
+the dives] for instructions on this topic.
+
[[S_ImportingDivelogsDe]]
==== Importing dives from *divelogs.de*
@@ -1231,7 +1301,6 @@ of the dives into _Subsurface_.
****
-
[icon="images/icons/important.png"]
[IMPORTANT]
But, the _CSV_ import has a couple of caveats. Avoid some special characters
@@ -1243,70 +1312,6 @@ size of the _CSV_ file might cause problems. Importing 100 dives at a time
the limits of the parser used. When encountering problems with _CSV_ imports, first try with
a smaller file to make sure everything works.
-[[S_SmartTrakImport]]
-==== Importing SmartTrak divelogs
-
-SmartTrak is a Windows based propietary software by Uwatec (today Scubapro).
-It works through Access databases, which makes it difficult to integrate the
-importer in _Subsurface_ core application, and stores the full raw data from
-the DC along with a plethora of other data manually added by the user, ranging
-from dive points to buddies data or DAN survey info.
-
-A little stand alone tool has been developed to import the .slg files
-generated by SmartTrak to Subsurface's .xml format. It can be built together
-with _Subsurface_ for linux systems. Two dependencies need to be installed in
-your system before building: libglib2.0 and libmdb2.
-
-Assuming installed those dependencies and _Subsurface_ source tree placed in a
-directory like ~/src/subsurface, then:
-
-*BUILDING*
-
-- Move to the source tree directory.
-- Run " $ ccmake build " and set SMARTTRAK_IMPORT option to *on* (off by
- default).
-- Generate with [c] and save and exit with [g].
-- Build as you prefer, using build.sh script (recomended) or moving to build
- directory and running make.
-- After a successful build, there will be an executable in the build directory
- named smtk2ssrf, copy or move it to a directory in your $PATH, e.g. ~/bin
-
-*RUNNING*
-
-smtk2ssrf accepts 0, 2 or more parameters. If it's launched without
-parameters and you are on a graphical environment a simple window will be
-displayed letting you choose the file(s) to import and a file to store the
-subsurface formatted data.
-
-[icon="images/icons/warning2.png"]
-[WARNING]
-Previous data in the output file will be
-erased, so *DO NOT* use your regular subsurface divelog file as output. It's
-advisable to set a brand new file to do the import.
-
-If launched from command line with 2 or more parameters like:
-
- $ smrtk2ssrfc /input/file_1.slg /input/file_2.slg /output/file.xml
-
-Files file_1.slg and file_2.slg in input directory will be imported and stored
-in file.xml in output directory.
-
-Check warning and error messages in console or graphical window, some may be
-interesting, as support for Galileo and family DCs is still a work in
-progress.
-
-*MERGING*
-
-Open the brand new imported file in _Subsurface_ and check the dives and data.
-If everything is fine, close the .xml file and open your regular divelog.
-Then from _Main menu_ select _Import -> Import log file_ and choose the
-imported .xml file. The imported dives will show in the _Dive List_, time
-ordered, along with the previous dives.
-The new dives, although time ordered, will keep the numbering system from
-SmartTrak, so a renumbering action is needed. See xref:S_Renumber[Renumbering
-the dives] section in this manual for instructions about this topic.
-
-
=== Importing Dive coordinates from a mobile device with GPS.
A smartphone with built-in GPS facilities can be used to store the locations of dives.
@@ -3012,9 +3017,11 @@ _Open_ button.
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.
+[[S_user_space]]
== Several _Subsurface_ users on one desktop computer
A frequent need is for two or more persons to use _Subsurface_ on the same desktop computer. For instance
-members of a household may use the same computer. There are two approaches for doing this.
+members of a household may use the same computer or one family member may perform dive uploads for other
+family members/friends. There are two approaches for doing this.
*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names
then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John
@@ -3767,6 +3774,29 @@ The text version of the dive plan is appended to the Notes in the _Notes Tab_. W
merged dive highlighted in the _Dive List_, switch
between the planned profile and the real-life profile using the righ-arrow/left-arrow keyboard keys.
+== Running _Subsurface_ from the command-line
+_Subsurface_ can be launched from the command-line to set some specialised settings or as
+part of an script-based automated process for manipulating a dive log. The format for launching _Subsurface_ from the
+command-line is:
+
+ subsurface [options] [logfile ...] [--import logfile ...]
+
+The options include:
+|====================
+|*Command-line option*|*Description*
+|--help|Print a summary of the command-line options
+| -h|Print a summary of the command-line options
+|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log
+|--verbose|Print debug information while running _Subsurface_
+| -v|Print debug information while running _Subsurface_
+| -v -v| Print even more debug information while running _Subsurface_
+|--version|Prints the current version of _Subsurface_.
+|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_
+|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username>
+|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections
+|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else
+|====================
+
== Description of the Subsurface Main Menu items
This section describes the functions and operation of the items in the Main Menu
--
2.7.4
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
