Commit graph

7053 commits

Author SHA1 Message Date
Dirk Hohndel
fb500f7056 Update Mac make package script
This reflects the switch to the custom name for the marble widget.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 11:29:40 -08:00
Thomas Maisl
eadfb073ba Usermanual - additional info for adding user to dialout-group
At least on Ubuntu systems an edit of a group membership takes effect only
after logging out and in of that user, if this user is currently logged in.

Signed-off-by: Thomas Maisl <exp-12004@maisl.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 08:22:32 -08:00
Guillaume GARDET
1910d6d546 Fix compilation with upstream Marble
<marble/MarbleDebug.h> is not availaible in all Marble versions.
As Marble::MarbleDebug::setEnabled(verbose) is only used when
MARBLE_SUBSURFACE_BRANCH is defined, also include header file only when
MARBLE_SUBSURFACE_BRANCH is set.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 08:09:54 -08:00
Robert C. Helling
d67cce2af8 Recording average depth data
This is the calculation that is needed to display a running average in the
profile.

It adds a new member plot_data.running_sum which can be turned into the
running average by dividing by plot_data.time.

Right now this isn't used by the UI.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 08:05:02 -08:00
Willem Ferguson
8400776595 Update of the release notes for V4.3
This updates the V4.3 release notes.
1) The release notes text is moved into a newly-created directory ReleaseNotes
2) Three images for the release notes are created in a subdirectory within
   the ReleaseNotes directory.
3) Light editing of the complete text of the release notes was done.

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 07:51:58 -08:00
Tim Wootton
a9bb191dba Adds advice on text strings to style guide
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 07:51:57 -08:00
Robert C. Helling
4921c28c4d Describe new CCR features in user manual
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 07:51:57 -08:00
Miika Turkia
299a85f668 Support cylinder information from Xdeep and Diving Log
This adds support for importing cylinder information from at least Xdeep
and Diving Log v 5.0.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-17 07:51:43 -08:00
Miika Turkia
ff338f62c2 Move the samples inside divecomputer tag on UDDF import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 21:54:46 -08:00
Dirk Hohndel
69784524b2 Massive rewrite of ReleaseNotes and README
Slowly getting ready for 4.3

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 20:33:28 -08:00
Dirk Hohndel
794eb1af1b Fix INSTALL file
Not sure what I was thinking there...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 20:05:27 -08:00
Dirk Hohndel
780ef9a912 Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 20:03:51 -08:00
Dirk Hohndel
01fee39da0 Small tweaks to the INSTALL file
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 11:56:39 -08:00
Dirk Hohndel
bbc7f1b72b Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:45:28 -08:00
Dirk Hohndel
ad4389aacb Merge branch 'testdoc'
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	Documentation/user-manual.txt
2014-12-16 07:13:46 -08:00
willem ferguson
86d6a1488e Update of user manual to give much more information about CSV dive log import
This patch addresses several issues:
1) At the beginning of the manual a section was rewritten, just after
   "How to open a new log book", to explain to the newby what the
   different options are for enetering dive data into the Subsurface
   dive log.
2) A new section "A diver's introduction to CSV files" was written as
   a boxed section.
3) The section dealing with CSV import from dive computers was
   shortened because much of the information was transferred to
   the new section in point 2) above.
4) The section dealing with CSV import from manually kept dive
   logs was expanded, specifically giving more information
   about import from manually kept dive logs in spreadsheets.
5) Appendix D was added, detailing CSV export from LibreOffice,
   OpenOffice and Microsoft Excel.

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:11:21 -08:00
Robert C. Helling
a6fdd6220b Removed leftover qDebug()'s
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:08:21 -08:00
Robert C. Helling
9ad3e83c77 Put manual set-point changes at negative time at start of dive
Manually inserting set-point changes at negative times (left
of the profile) caused the setpoint to end up at stupid values
(probably some signed/unsigned confusion). This patch aligns
them with the start of the dive.

Fixes #774

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:07:49 -08:00
Salvador Cuñat
1cf3b9a011 Update spanish translation of user manual to english 0e3fb54
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:07:08 -08:00
Dirk Hohndel
bceff788fb Only setup marble debug output when comiling against our branch
Otherwise this might break the compile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 07:06:22 -08:00
Dirk Hohndel
da16258d61 INSTALL file: add Windows cross building instructions
And other small adjustments

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 18:19:21 -08:00
Dirk Hohndel
899d3aeb3a Update INSTALL file with package names for Debian and OpenSUSE
Still TODO are Mac and cross building

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 14:53:04 -08:00
Dirk Hohndel
028bd1e235 Ubuntu packaging: this works better for changelog
Tiny change, specify the version as the tools get it wrong by default

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 14:52:32 -08:00
Dirk Hohndel
e63b642252 Document the use of SPECIAL_MARBLE_PREFIX=1
Since we suggest building with our marble branch we need to tell people to use
SPECIAL_MARBLE_PREFIX=1 or the build process won't find the correct library.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 12:11:14 -08:00
Dirk Hohndel
6da5775c05 Ubuntu packaging: more tweaks
* only build a static libdivecomputer
* only build the libgit2 library, not the executable
* don't echo all the symlinks when fake-installing libmarblewidget

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 12:09:38 -08:00
Dirk Hohndel
5e9c491f19 Ubuntu packaging: add support for better changelog tracking
This now assumes that a running changelog is maintained in
src/debian.changelog, i.e., at the same level as the subsurface tree; the
organization now should look like this:

src/debian.changelog
src/subsurface                 # subsurface git checkout
src/subsurface/libdivecomputer # libdivecomputer git Subsurface-xx branch
src/subsurface/marble-source   # marble git Subsurface-xx branch
src/subsurface/libgit2         # libgit2 git checkout

Instead of running dh_make to create all new debian build files, we add the
necessary files in our script.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 10:21:23 -08:00
Martin Long
51fdf86a2b Fix event/alarm types in UDDF export.
UDDF only supports a specific set of alarms. Some events also don't map
to alarms but map to other types of elements in UDDF.

This patch adds a map of the accepted types. Where a map doesn't exist
the type will not be mapped to an alarm, the option then remains to
map it to another kind of element, in the same way that happened with
headings and gas switches.

This removes the need for the specific exclusion of heading and
gas switch, as they are now simply not included in the map.

Signed-off-by: Martin Long <martin@longhome.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 23:22:05 -08:00
Dirk Hohndel
29d4716af0 First cut of updates to the INSTALL file
Mention our Subsurface branches of Marble and libdivecomputer
Massive update of the Linux build instructions

TODO: correct package lists for the different Linux distributions
TODO: update instructions for Mac
TODO: update crossbuild instructions

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 22:19:48 -08:00
Miika Turkia
4875de45e6 Default some graphs to false
These values are treated as false upon starting Subsurface. Thus they
should be set to false as well. Otherwise extra graphs are drawn to the
profile when exiting the preferences dialog.

Fixes #783

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 11:42:29 -08:00
Pedro António Neves
0e3fb549bd New images for the user manual
Added 3 more images to the User Manual (Appendix E).
Images illustrate the creation of .CSV file from LibreOffice Calc.

Signed-off-by: Pedro António Neves <nevesdiver@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 10:08:34 -08:00
Pedro António Neves
9b924b4fdd Updated User Manual to include information on how to add dive data to a new logbook.
- Changed section 4 name to: Storing dive information in the logbook (to keep it in line with the other titles)

- Added some introductory text to section 4, together with links to the appropriate sections on the manual

- Changed figure Import_CSV2.jpg to reflect date format options

- Added an Appendix (E) explaining users how to create a .CSV file from LibreOffice Calc

- Added 3 more images to illustrate Appendix E

Signed-off-by: Pedro António Neves <nevesdiver@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 10:08:16 -08:00
Miika Turkia
fef56399b9 Count the weights properly on UDDF export
Using node() along with the node-set seems to grab the weights properly
for me.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 10:06:34 -08:00
Salvador Cuñat
38d78062cb Update spanish translation of user manual to english 3c9c1ec
Only update some figures to Fedora 20.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 10:04:22 -08:00
Dirk Hohndel
9fe458ea2e Enable Marble debug messages from Subsurface command line
Calling Subsurface with -v now gets you debug output. Of course, with a
regular "release" build of Marble you still won't see much. But with the
changes in the special Subsurface-testing branch you actually get some
very useful information when debugging a lack of maps in Marble.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 17:08:58 -08:00
Anton Lundin
e6c587ad62 Remove debug printf
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:36:08 -08:00
Miika Turkia
2307acd37f Include weight system on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:18:23 -08:00
Miika Turkia
a06ce34123 Include dive buddies on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:18:16 -08:00
Miika Turkia
1c7efda5e1 Include dive location on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:18:11 -08:00
Miika Turkia
0a533d9dc2 Include notes on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:18:07 -08:00
Miika Turkia
e5c291aca4 Fix name for temperature sample on UDDF import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:58 -08:00
Miika Turkia
41e9ec12e2 UDDF import: check following event time
Seems that our UDDF export is adding time after the event name. Thus we
need to add reading the following time as well.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:53 -08:00
Miika Turkia
88cf25075f Include temperatures properly on uddf import
Adjust to UDDF 3.2 specification and use proper tag name for air
temperature.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:49 -08:00
Miika Turkia
a2bcbae4f3 Include rating and visibility on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:42 -08:00
Miika Turkia
b694e960b7 Grab manually added air temperature on UDDF export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:38 -08:00
Miika Turkia
cb576e49d3 Include dive duration on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:28 -08:00
Miika Turkia
872ee7efab Include dive number on uddf import
Adjust to UDDF 3.2 specification

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 13:17:17 -08:00
Miika Turkia
cb0762a3ff Fix switchmix references on UDDF export
The switchmix values must be concatenated properly.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 08:51:59 -08:00
Miika Turkia
453aeab470 Fix mix reference on UDDF export
The mix value must be concatenated properly.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 08:51:53 -08:00
Miika Turkia
0a99c26590 Export leadquantity only when we have weights
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 08:51:47 -08:00
Miika Turkia
aa76bbaa97 Export only used cylinders to divelogs.de
This attempts to export only used cylinders to divelogs.de. The
detection is based only on o2 percentage as per our test dives. However,
the new cylinder id would be better, but that does not exist on old
dives.

Fixes #757

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13 08:50:53 -08:00