This is the official upstream of the Subsurface divelog program
Find a file
Dirk Hohndel 818542eeca Don't merge divecomputers if we know they are different
When merging dives, if we know for sure that the dive computers are
different, don't merge them into one (by interleaving the data), but
instead keep both as separate dive computers in the same dive.

This fixes a bug when due to a faulty download the same dive from two dive
computers looks quite different. They don't get merged automatically
(which is fine - they are quite different), but when manually merging
them, we of course want one dive with two dive computers, not one dive
with one merged dive computer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-05-14 13:08:06 +09:00
.tx Add simple glossary 2013-12-29 10:34:12 -08:00
appdata Make the appdata file validate 2014-01-24 07:36:25 -08:00
dives Add test dive that shows heart rate 2014-04-07 14:20:01 -07:00
Documentation Documentation spelling errors 2014-05-11 02:00:53 -07:00
icons New icons 2014-04-16 12:10:28 -07:00
marbledata Add a CMake based buildsystem for the tests. 2014-04-14 11:49:49 -07:00
packaging Windows out of tree cross build: stage package in correct folder 2014-04-21 12:16:56 -07:00
qt-ui Do not use default filename as default for "Save as" 2014-05-14 06:13:03 +09:00
scripts Make it executable and remove magic whitespace on shebang line. 2014-03-06 07:08:00 -08:00
tests Moved code around to make possible to compile the C part alone. 2014-04-17 08:46:29 -07:00
translations Latest translation from Transifex 2014-05-07 21:25:53 -07:00
xslt Marginal optimization of UDDF import 2014-05-05 09:00:26 -07:00
.clang-format Add a simplistic tool to clean up whitespace 2014-02-12 22:33:01 -08:00
.gitattributes Ignore some files when archiving. 2013-05-12 07:25:47 -07:00
.gitignore Add .DS_Store files to .gitignore 2014-03-03 09:36:06 -08:00
android.cpp Introduce android specific file 2014-03-27 10:40:43 -07:00
CMakeLists.txt Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
cochran.c Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
CodingStyle CodingStyle "to" "too" typo 2014-05-10 09:41:17 -07:00
color.h Make heartrate grid less confusing 2014-04-28 12:45:42 -07:00
deco.c Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
deco.h Put include guard to every header 2014-02-11 12:37:01 -08:00
descriptor3.tsv Add structured file with list of supported dive computers 2013-12-13 16:26:01 -08:00
device.c Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
device.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
display.h Show EAD/END only for trimix/nitrox dives respectively 2014-03-31 08:58:35 -07:00
dive.c Don't merge divecomputers if we know they are different 2014-05-14 13:08:06 +09:00
dive.h Rename getDiveById to get_dive_by_id to keep current c code organized. 2014-05-13 09:24:37 +09:00
divecomputer.cpp Do not check for null before free. 2014-05-13 09:26:50 +09:00
divecomputer.h Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
divelist.c Do not check for null before free. 2014-05-13 09:26:50 +09:00
divelist.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
equipment.c Simplify string comparison 2014-05-06 14:15:59 -07:00
file.c Convert other users of showError() to the new world order 2014-03-14 12:36:06 -07:00
file.h Put include guard to every header 2014-02-11 12:37:01 -08:00
gettext.h Add comment for "below floor" event 2013-11-29 11:27:41 -08:00
gettextfromc.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
gettextfromc.h Explicitly include needed include file 2014-04-29 22:35:34 -07:00
gpl-2.0.txt Add a copy of the GPL v2 to the project 2011-09-26 11:18:28 -07:00
helpers.h Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
INSTALL Update cross building for Windows on Linux 2014-03-07 16:33:00 -08:00
libdivecomputer.c Don't check for tank size information only on first tank 2014-03-15 13:46:35 -07:00
libdivecomputer.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
linux.c git-save: improve commit authorship data 2014-04-14 16:07:59 -07:00
load-git.c Fix git loading of odd locales 2014-05-12 16:56:43 +09:00
macos.c git-save: improve commit authorship data 2014-04-14 16:07:59 -07:00
main.cpp Fix crash with libgit when it's compiled with GIT_THREADS 2014-03-31 13:56:14 -07:00
membuffer.c Use helper function to write decimal numbers 2014-04-05 16:10:11 -07:00
membuffer.h Use helper function to write decimal numbers 2014-04-05 16:10:11 -07:00
parse-xml.c Removed the globals 'userid' and 'save_userid_local' variables 2014-04-17 08:37:31 -07:00
planner.c Planner: Add waipoints when changing ascend rate in planner 2014-05-08 12:28:16 -07:00
planner.h Remove external declaration of non-existant global variable 2014-02-12 05:35:30 -08:00
pref.h Make rulergraph a pref as well 2014-05-05 15:53:46 -07:00
profile.c Do not check for null before free. 2014-05-13 09:26:50 +09:00
profile.h Remove a Lot of Dead Code. 2014-03-07 08:56:06 -08:00
qt-gui.cpp Do not check for null before free. 2014-05-13 09:26:50 +09:00
qt-gui.h Main: separate the QApplication and UI creation 2014-03-19 09:37:49 -07:00
qthelper.cpp Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
qthelper.h Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
README Getting ready for 4.1 2014-05-07 21:35:40 -07:00
Readme.testing Information on writing test cases 2014-04-15 11:03:38 -07:00
ReleaseNotes.txt Getting ready for 4.1 2014-05-07 21:35:40 -07:00
satellite.svg Satellite icon diet 2013-01-22 22:25:03 -08:00
save-git.c git save: don't crash if the last dive isn't in a trip 2014-05-14 06:16:41 +09:00
save-xml.c Rewrite show_location to use membuffer primitives 2014-05-08 12:25:32 -07:00
sha1.c Another small tweak to whitespace tool 2014-03-05 13:02:23 -08:00
sha1.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
statistics.c Do not check for null before free. 2014-05-13 09:26:50 +09:00
statistics.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
strtod.c Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
subsurface-configure.pri More cross building stuff 2014-04-21 08:54:04 -07:00
subsurface-gen-version.pri Fix building in git shallow clones 2014-01-21 11:35:31 -08:00
subsurface-icon.svg Rename subsurface.svg to subsurface-icon.svg 2013-02-02 21:27:15 +01:00
subsurface-install.pri Windows out of tree cross build: stage package in correct folder 2014-04-21 12:16:56 -07:00
subsurface.1 Tweaking man page to better reflect current status 2013-12-14 20:19:58 -08:00
subsurface.desktop The Subsurface icon has been renamed, the .desktop must be adjusted. 2013-02-14 09:57:13 -08:00
subsurface.pro Move DiveList related methods/classes to own file. 2014-05-13 09:20:28 +09:00
subsurface.qrc Add GUI support for exporting in CSV format 2014-04-26 17:20:32 -07:00
subsurfacestartup.c Renaming the prefs struct members to be consistent with the QSettings. 2014-04-16 13:09:55 -07:00
subsurfacestartup.h Put include guard to every header 2014-02-11 12:37:01 -08:00
SupportedDivecomputers.html Make the SupportedDivecomputers.html match web site 2013-12-15 08:16:06 -08:00
SupportedDivecomputers.txt Convert structure list of supported dive computers to txt / html 2013-12-13 16:44:51 -08:00
terms Add new terms which can be a useful reference 2014-03-05 12:14:26 -08:00
time.c Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
uemis-downloader.c rename 'get_dive_by_diveid' to 'get_dive_by_uemis_diveid' 2014-05-13 09:21:35 +09:00
uemis.c Uemis GPS location tracking seems backwards 2014-03-08 16:55:25 -08:00
uemis.h Uemis GPS location tracking seems backwards 2014-03-08 16:55:25 -08:00
units.h Move unit related code to units.h 2014-05-11 01:55:53 -07:00
webservice.h Put include guard to every header 2014-02-11 12:37:01 -08:00
windows.c Change the default font on Windows to Calibri 2014-04-19 11:40:36 -07:00
worldmap-options.h Exporting a World-Map 2014-03-30 15:52:32 -07:00
worldmap-save.c Fix HTML errors 2014-04-06 14:17:09 -07:00
worldmap-save.h Exporting a World-Map 2014-03-30 15:52:32 -07:00
wreck.jpg Include images in profile 2014-02-06 11:29:23 -08:00

This is the README file for Subsurface 4.1

This is mainly a bug fix release, but there are rather significant changes
under the hood. Check the ReleaseNotes.txt for details.

License: GPLv2

Subsurface can be found at http://subsurface.hohndel.org

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

git clone git://subsurface.hohndel.org/subsurface.git .

You can also browse the sources via gitweb at git.hohndel.org

If you want the latest release (instead of the bleeding edge
development version) you can either get this via

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

if you have already cloned the git repository as shown above or you
can get a tar ball from

http://subsurface.hohndel.org/downloads/Subsurface-4.1.tgz


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

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

$ ./subsurface

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


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

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

If you want to contribute code, please either send signed-off patches or
a pull request with signed-off commits.  If you don't sign off on them,
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