This is the official upstream of the Subsurface divelog program
Find a file
Salvador Cuñat e4086dc746 smtk-import Avoid duplicities in bookmarks
SmartTrak's bookmarks work in the same fashion Subsurface's do. The user
may set a bookmark while underwater or set it just on the divelog
software.
At this time we are parsing those set in the DC twice, as we get one
from libdivecomputer and another from smarttrak's database.

This patch just checks if we have a bookmark event downloaded by
libdivecomputer which has the same time that the one parsed from the
.slg file. If so, merge the names taking the one from smarttrak.

Text from smarttrak is preferred because the user may have entered some
interesting note there and libdivecomputer's name is just "bookmark".

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-04-04 10:54:55 -07:00
.tx Add simple glossary 2013-12-29 10:34:12 -08:00
android Revert "Add a simple cp2130 libusb driver" 2016-09-22 14:56:31 -07:00
android-mobile android: Rework build.sh 2017-02-06 21:16:10 -08:00
appdata dive master > divemaster 2017-03-04 12:08:17 -08:00
cmake/Modules Update Subsurface-mobile version to 1.2.1 2017-03-24 12:00:45 -07:00
core Shift fake tank pressures up by 30bar 2017-03-30 11:44:45 +02:00
desktop-widgets UI: preferences-profile screen beautify 2017-03-29 13:21:50 +02:00
dives Fix potential double/float to int rounding errors 2017-03-09 23:07:30 +07:00
Documentation user manual: Preferences Defaults renamed to General 2017-03-24 09:32:41 -07:00
icons Remove unused DateWidget with its icon. 2017-03-13 10:25:51 -07:00
marbledata Add 1x1 transparent png to replace missing marble data 2015-07-09 16:38:36 -07:00
mobile-widgets QML UI: ensure actions are set up for Credentials page 2017-04-03 10:49:07 -07:00
packaging mxe_build.sh - Rebuild everyth. when switching between debug and release 2017-04-01 08:08:16 -07:00
printing_templates Use abbreviations with dots. 2017-03-11 08:09:07 -08:00
profile-widget minimal pO2 threshold: color the p02 graph also for minumum 2017-03-28 11:17:03 -07:00
qt-models Always show notes when replanning 2017-03-28 13:31:45 -07:00
ReleaseNotes Update ReleaseNotes 2017-03-24 09:44:26 -07:00
scripts QML UI: Fully port dive edit to Kirigami2 2017-04-01 09:35:51 +02:00
smtk-import smtk-import Avoid duplicities in bookmarks 2017-04-04 10:54:55 -07:00
tests Cleanup for CSV testing 2017-04-01 08:06:09 -07:00
theme Use abbreviations with dots. 2017-03-11 08:09:07 -08:00
translations Update translation source strings 2017-03-28 22:32:53 +02:00
xslt Add the pressure attribute only if it exists 2017-04-01 08:06:09 -07:00
.clang-format Reenable ForEachMacros in .clang-format 2015-10-19 07:37:05 -07:00
.gitattributes Treat minified JavaScript as binary 2016-07-09 12:07:25 -07:00
.gitignore Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
.travis.yml travis: Correct infrastructure for tests on mobile 2017-02-07 07:48:31 -08:00
CMakeLists.txt QML UI: we now depend on QuckControls2 2017-04-01 09:37:15 +02:00
CodingStyle CodingStype: add explanation how to install the QtCreator settings 2015-09-07 07:58:35 -07:00
descriptor3.tsv Add structured file with list of supported dive computers 2013-12-13 16:26:01 -08:00
export-html.cpp Finish removal of informational_prefs 2017-02-05 12:44:11 -08:00
gpl-2.0.txt Add second copy of the GPL 2016-09-22 18:15:26 -07:00
INSTALL fix: Unable to locate package libqt5declarative5 2017-02-20 04:18:33 -08:00
LICENSE Move license file to LICENSE 2016-09-21 15:28:05 -07:00
qt-installer-noninteractive.qs Add a travis build of subsurface 2017-02-05 14:46:08 -08:00
README Update README for 4.6.3 2017-03-01 21:54:51 -08:00
Readme.testing Information on writing test cases 2014-04-15 11:03:38 -07:00
Readme.ubuntu Update Readme.ubuntu 2015-01-15 19:48:11 -08:00
subsurface-desktop-helper.cpp Settings update: Add "Dive Computer" settings to SettingsObjectWrapper 2016-08-27 11:40:44 -07:00
subsurface-desktop-main.cpp Win32: add the --win32log option to log stdout and stderr to files 2017-02-03 09:24:42 -08:00
subsurface-mobile-helper.cpp Fix compile for Subsurface-mobile 2016-08-27 12:45:20 -07:00
subsurface-mobile-main.cpp QML UI: Fully port dive edit to Kirigami2 2017-04-01 09:35:51 +02:00
subsurface.debug Add subsurface.debug script to help debugging and install it (for Linux only) 2015-10-29 08:35:01 -07:00
subsurface.desktop Add a trailing ';' to the Keywords in the subsurface.desktop file 2014-12-22 15:55:04 -08:00
subsurface.qrc Remove unused DateWidget with its icon. 2017-03-13 10:25:51 -07:00
subsurface_enabled_translations Added missing Qt5 translation files 2017-02-01 16:28:42 -08:00
subsurfacetemplate.tex Export to TeX file initialized 2016-10-11 22:00:08 -07:00
SupportedDivecomputers.html Update the list of supported divecomputers 2017-01-14 19:24:02 -08:00
SupportedDivecomputers.txt Update the list of supported divecomputers 2017-01-14 19:24:02 -08:00
terms PO₂ > pO₂ 2017-03-13 10:28:06 -07:00
TODO.CCR Update todo list for CCR 2014-11-18 13:15:43 +00:00
wreck.jpg Include images in profile 2014-02-06 11:29:23 -08:00

This is the README file for Subsurface 4.6.3

Please check the ReleaseNotes.txt for details about new features and
changes since Subsurface 4.6.2 (and earlier versions).

Subsurface can be found at http://subsurface-divelog.org

Our user forum is at http://subsurface-divelog.org/user-forum/
We also try to respond to questions in the ScubaBoard.com dive software
forum at http://www.scubaboard.com/forums/dive-software/

Report bugs and issues at
https://github.com/Subsurface-divelog/subsurface/issues

License: GPLv2

You can get the sources to the latest development version from the git
repository:

git clone git://github.com/Subsurface-divelog/subsurface

You can also fork the repository and browse the sources at the same site,
simply using https://github.com/Subsurface-divelog/subsurface

If you want the latest release (instead of the bleeding edge
development version) you can either get this via git or the release tar
ball. After cloning run the following command:

git checkout v4.6.3  (or whatever the last release is)

or download a tar ball from:

http://subsurface-divelog.org/downloads/Subsurface-4.6.3.tgz

Detailed build instructions can be found in the INSTALL file.

Basic Usage:
============

Install and start from the desktop, or you can run it locally from the
build directory:

On Linux:

$ ./subsurface

On Mac:

$ open Subsurface.app

Native builds on Windows are not really supported (the official Windows
installers are both cross-built on Linux).

You can give a data file as command line argument, or (once you have
set this up in the Preferences) Subsurface picks a default file for
you when started from the desktop or without an argument.

If you have a dive computer supported by libdivecomputer, you can just
select "Import from Divecomputer" from the "Import" menu, select which
dive computer you have (and where it is connected if you need to), and
hit "OK".

The latest list of supported dive computers can be found in the file
SupportedDivecomputers.txt.

Much more detailed end user instructions can be found from inside
Subsurface by selecting Help (typically F1). When building from source
this is also available as Documentation/user-manual.html. The
documentation for the latest release is also available on-line
http://subsurface-divelog.org/documentation/


Contributing:
=============

There is a mailing list for developers: subsurface@subsurface-divelog.org
Go to http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
to subscribe.

If you want to contribute code, please open a pull request with signed-off
commits at https://github.com/Subsurface-divelog/subsurface/pulls
(alternatively, you can also send your patches as emails to the developer
mailing lsit).

Either way, if you don't sign off your patches, we will not accept them.
This means adding a line that says "Signed-off-by: Name <email>" at the
end of each commit, indicating that you wrote the code and have the right
to pass it on as an open source patch.

See: http://developercertificate.org/

Also, please write good git commit messages.  A good commit message
looks like this:

	Header line: explain the commit in one line (use the imperative)

	Body of commit message is a few lines of text, explaining things
	in more detail, possibly giving some background about the issue
	being fixed, etc etc.

	The body of the commit message can be several paragraphs, and
	please do proper word-wrap and keep columns shorter than about
	74 characters or so. That way "git log" will show things
	nicely even when it's indented.

	Make sure you explain your solution and why you're doing what you're
	doing, as opposed to describing what you're doing. Reviewers and your
	future self can read the patch, but might not understand why a
	particular solution was implemented.

	Reported-by: whoever-reported-it
	Signed-off-by: Your Name <youremail@yourhost.com>

where that header line really should be meaningful, and really should be
just one line.  That header line is what is shown by tools like gitk and
shortlog, and should summarize the change in one readable line of text,
independently of the longer explanation. Please use verbs in the
imperative in the commit message, as in "Fix bug that...", "Add
file/feature ...", or "Make Subsurface..."


A bit of Subsurface history:
============================

In fall of 2011, when a forced lull in kernel development gave him an
opportunity to start on a new endeavor, Linus Torvalds decided to tackle
his frustration with the lack of decent divelog software on Linux.

Subsurface is the result of the work of him and a team of developers since
then. It now supports Linux, Windows and MacOS and allows data import from
a large number of dive computers and several existing divelog programs. It
provides advanced visualization of the key information provided by a
modern dive computer and allows the user to track a wide variety of data
about their diving.

In fall of 2012 Dirk Hohndel took over as maintainer of Subsurface.