mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly capitalize JDiveLog

Browse source 
Suggested-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-02-20 22:02:07 -08:00
parent 153670ed4e
commit 91c6d57e32
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Documentation/user-manual.txt
View file

@ -45,7 +45,7 @@ Subsurface, you need some preparation. Do you have the following:
4. If needed, the manual of your dive computer 4. If needed, the manual of your dive computer
Alternatively you can import your divelogs from a couple of other Alternatively you can import your divelogs from a couple of other
divelog applications (JDivelog, MacDive, Suunto Dive Manager, divelog applications (JDiveLog, MacDive, Suunto Dive Manager,
divelogs.de). However, divelogs.de). However,
native download from dive computer directly to Subsurface is native download from dive computer directly to Subsurface is
recommended. recommended.
@ -525,7 +525,7 @@ Importing Divelogs from other Software
Subsurface will import divelogs from a couple of other log software. We Subsurface will import divelogs from a couple of other log software. We
support currently XML exports from DivingLog, divelogs.de and Suunto support currently XML exports from DivingLog, divelogs.de and Suunto
DiveManager. Native format of JDivelog and MacDive are imported as well. DiveManager. Native format of JDiveLog and MacDive are imported as well.
When importing dives subsurface tries to detect multiple records for When importing dives subsurface tries to detect multiple records for
the same dive and merges the information as best as it can. So as long the same dive and merges the information as best as it can. So as long
@ -533,20 +533,20 @@ as there are no time zone issues (or other reasons that would cause the
beginning time of the dives to be substantially different) subsurface beginning time of the dives to be substantially different) subsurface
will not create duplicate entries. will not create duplicate entries.
[[S_ImportingDivesJDivelog]] [[S_ImportingDivesJDiveLog]]
Importing Dives from JDivelog Importing Dives from JDiveLog
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Maybe you have been using JDivelog and you have a lot of dives logged in Maybe you have been using JDiveLog and you have a lot of dives logged in
this program. You don't have to type all information by hand into this program. You don't have to type all information by hand into
Subsurface, because you can import your divelogs from JDivelog. Subsurface, because you can import your divelogs from JDiveLog.
JDivelog stores its information into files with the extension of .jlb. JDiveLog stores its information into files with the extension of .jlb.
These .jlb contain all the information that has been stored, except your These .jlb contain all the information that has been stored, except your
images in xml format. images in xml format.
By using the menu 'File - Import XML File(s)' you get a popup asking By using the menu 'File - Import XML File(s)' you get a popup asking
for the file name. To import your JDivelog file(s) do the following: for the file name. To import your JDiveLog file(s) do the following:
- Open 'File - Import XML Files(s)' on the menu - Open 'File - Import XML Files(s)' on the menu
- Browse your directories to the location where your *.jlb file is - Browse your directories to the location where your *.jlb file is
@ -556,7 +556,7 @@ for the file name. To import your JDivelog file(s) do the following:
After a few moments, you see your existing logs in Subsurface. Now you can After a few moments, you see your existing logs in Subsurface. Now you can
edit your dives like explained in <<S_EditDiveInfo, chapter Editing the Dive Info>>. edit your dives like explained in <<S_EditDiveInfo, chapter Editing the Dive Info>>.
Information that is imported from JDivelog into the location field: Information that is imported from JDiveLog into the location field:
- Extended dive location information - Extended dive location information
@ -571,7 +571,7 @@ Information that is merged into the location or notes field:
Alternatively, you can start subsurface with the --import command line Alternatively, you can start subsurface with the --import command line
which will have the same effect: which will have the same effect:
subsurface MyDives.xml --import JDivelogDives.jlb subsurface MyDives.xml --import JDiveLogDives.jlb
will open your divelog (assuming that's called MyDives.xml) and then will open your divelog (assuming that's called MyDives.xml) and then
import the dives from JdivelogDives.jlb. You can now save the combined import the dives from JdivelogDives.jlb. You can now save the combined
@ -633,7 +633,7 @@ We currently attempt to import all the relevant dive information
excluding the used equipment and diver name. excluding the used equipment and diver name.
It is also possible to do the importing from command line just like with It is also possible to do the importing from command line just like with
JDivelog (see <<S_ImportingDivesJDivelog, chapter Importing Dives from JDivelog>>): JDiveLog (see <<S_ImportingDivesJDiveLog, chapter Importing Dives from JDiveLog>>):
subsurface MyDives.xml --import MacDiveDives.xml subsurface MyDives.xml --import MacDiveDives.xml
@ -669,7 +669,7 @@ The fields that are currently not imported are: weather, visibility and
boat. boat.
It is also possible to do the importing from command line just like with It is also possible to do the importing from command line just like with
JDivelog (see <<S_ImportingDivesJDivelog, chapter Importing Dives from JDivelog>>): JDiveLog (see <<S_ImportingDivesJDiveLog, chapter Importing Dives from JDiveLog>>):
subsurface MyDives.xml --import yourUserName.DLD subsurface MyDives.xml --import yourUserName.DLD

2
ReleaseNotes.txt
View file

@ -26,7 +26,7 @@ of dive computers (most common dive computers are supported, a
detailed list is at detailed list is at
http://subsurface.hohndel.org/documentation/supported-dive-computers). http://subsurface.hohndel.org/documentation/supported-dive-computers).
Subsurface can also import existing dive logs from several sources Subsurface can also import existing dive logs from several sources
including MacDive, Suunto DM3, JDivelog and divelogs.de. Another including MacDive, Suunto DM3, JDiveLog and divelogs.de. Another
strength is its ability to visualize the depth profile (and, if strength is its ability to visualize the depth profile (and, if
available, the tank pressure curve) in very innovative ways that give available, the tank pressure curve) in very innovative ways that give
the user additional information on relative velocity (and momentary the user additional information on relative velocity (and momentary