From a6f9a37831c8dc57be21e48e8acc10a435427cca Mon Sep 17 00:00:00 2001 From: Willem Ferguson Date: Sat, 7 Jan 2017 13:02:23 +0200 Subject: [PATCH] User manual updates 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 Signed-off-by: Dirk Hohndel --- 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 e5fc49faa..5cdd1b2d6 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:subsurface@subsurface-divelog.org[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=|Choose the xref:S_user_space[configuration space] of user +|--cloud-timeout=|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